Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Medalfluff and jungle vr map fix #1356

Merged
merged 3 commits into from
Dec 30, 2023
Merged

Medalfluff and jungle vr map fix #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
675afd5
Event medal fluff items for 6 crew
Repede Dec 30, 2023
0a98f39
Event medals refactor
Repede Dec 30, 2023
c740f41
Merge branch 'master' into medalfluff
Repede Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions code/modules/client/preference_setup/loadout/event_fluffitems_yw.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/obj/item/clothing/accessory/medal/silver/achievement
name = "Medal of Achievement"
desc = "A silver medal awarded to corporate members who have achieved a corporate goal successfully."

/obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent
desc = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage."

/datum/gear/fluff/event_medal_twoshuttles
path = /obj/item/clothing/accessory/medal/silver/achievement/twoshuttlesevent
display_name = "Medal of Achievement"
description = "A silver medal awarded to corporate members who have achieved a corporate goal successfully. - This one was awarded for bringing two damaged shuttles back to Cryogaia for rescue and salvage."
ckeywhitelist = list("snakewitharocketlauncher", "blackangelsace", "bielbr12312332", "hidingdan", "montessquio", "tinncatt")
character_name = list("Dakula", "Art Echard", "Dustin Altmann", "Sierra Ellis", "Elise Maschenny", "Kurkivor Snowstrider")
2 changes: 1 addition & 1 deletion code/modules/clothing/under/accessories/accessory_yw.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@


/obj/item/clothing/accessory/poncho/cloak/fluff/dropped() //makes the fluff cloaks not kek when used by a teshari
icon_override = 'icons/vore/custom_onmob_yw.dmi'
icon_override = 'icons/vore/custom_onmob_yw.dmi'
1 change: 1 addition & 0 deletions vorestation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1997,6 +1997,7 @@
#include "code\modules\client\preference_setup\global\03_pai.dm"
#include "code\modules\client\preference_setup\global\04_ooc.dm"
#include "code\modules\client\preference_setup\global\setting_datums.dm"
#include "code\modules\client\preference_setup\loadout\event_fluffitems_yw.dm"
#include "code\modules\client\preference_setup\loadout\gear_tweaks.dm"
#include "code\modules\client\preference_setup\loadout\gear_tweaks_vr.dm"
#include "code\modules\client\preference_setup\loadout\loadout.dm"
Expand Down