diff --git a/GainStation13/icons/obj/halloween_items.dmi b/GainStation13/icons/obj/halloween_items.dmi new file mode 100644 index 0000000000..392ec60c35 Binary files /dev/null and b/GainStation13/icons/obj/halloween_items.dmi differ diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 19927b9bd6..b854b2f03c 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -1,15 +1,16 @@ /datum/round_event_control/electrical_storm name = "Electrical Storm" typepath = /datum/round_event/electrical_storm - earliest_start = 20 MINUTES + earliest_start = 30 MINUTES min_players = 5 weight = 40 + max_occurrences = 2 category = EVENT_CATEGORY_ENGINEERING description = "Destroys all lights in a large area." /datum/round_event/electrical_storm var/lightsoutAmount = 1 - var/lightsoutRange = 25 + var/lightsoutRange = 10 announce_when = 1 /datum/round_event/electrical_storm/announce(fake) diff --git a/code/modules/holiday/halloween/jacqueen.dm b/code/modules/holiday/halloween/jacqueen.dm index 117a188af8..f787258f20 100644 --- a/code/modules/holiday/halloween/jacqueen.dm +++ b/code/modules/holiday/halloween/jacqueen.dm @@ -34,7 +34,7 @@ /mob/living/simple_animal/jacq name = "Jacqueline the Pumpqueen" real_name = "Jacqueline" - icon = 'icons/obj/halloween_items.dmi' + icon = 'GainStation13/icons/obj/halloween_items.dmi' icon_state = "jacqueline" maxHealth = 25 health = 25 diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index 58dd6e9fc3..fafa876227 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -212,3 +212,20 @@ /datum/gear/head/kabuto name = "Kabuto helmet" path = /obj/item/clothing/head/kabuto + +//GS13 +// /datum/gear/head/rose +// name = "Rose" +// path = /obj/item/grown/rose + +/datum/gear/head/sunflower + name = "Sunflower" + path = /obj/item/grown/sunflower + +/datum/gear/head/poppy + name = "Poppy" + path = /obj/item/reagent_containers/food/snacks/grown/poppy + +/datum/gear/head/harebell + name = "Harebell" + path = /obj/item/reagent_containers/food/snacks/grown/harebell diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 4ff90fb7fe..1358c49576 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -750,3 +750,10 @@ path = /obj/item/clothing/under/rank/civilian/polychromic_clown subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Clown") + + +//GS13 stuff + +/datum/gear/uniform/modularjumpsuit + name = "Modular Jumpsuit (gray)" + path = /obj/item/clothing/under/color/grey/modular