Merge branch 'master' of https://github.com/sheepishgoat/GS13-Citadel into tweaks-and-fixes

Revert "mirror appearance"
This reverts commit 050dcb5cc1.
2024-10-15 14:16:16 +02:00 · 2024-10-15 14:15:45 +02:00 · 2024-10-14 17:49:11 +02:00 · 2024-10-14 17:19:26 +02:00
5 changed files with 28 additions and 3 deletions
@@ -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)
@@ -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
@@ -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
@@ -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
Author	SHA1	Message	Date
evilew	7f156083f5	Merge branch 'master' of https://github.com/sheepishgoat/GS13-Citadel into tweaks-and-fixes	2024-10-15 14:16:16 +02:00
evilew	39a425e2cd	Revert "mirror appearance" This reverts commit `050dcb5cc1`.	2024-10-15 14:15:45 +02:00
evilew	050dcb5cc1	mirror appearance threw in some defines and other stuff for testing 'mirrorcanloadappearance', but it just kinda doesn't seem to work	2024-10-14 17:49:11 +02:00
evilew	f82de944b3	small tweaks - brought back fat jacqueen sprites - added modular suits and flowers to loadouts - nerfed electrical storms	2024-10-14 17:19:26 +02:00