From 89a03ef577eb28ad3679da689add506e6bbee71f Mon Sep 17 00:00:00 2001 From: Lzimann Date: Fri, 25 Nov 2016 19:01:53 -0200 Subject: [PATCH 1/3] Adds a new spawn xmas tree landmark and also adds a new holiday, the festive season. --- code/__DEFINES/misc.dm | 1 + code/modules/events/holiday/xmas.dm | 4 ++++ code/modules/holiday/holidays.dm | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index e20b4b1533d..f1c88130f75 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -27,6 +27,7 @@ #define EASTER "Easter" #define HALLOWEEN "Halloween" #define CHRISTMAS "Christmas" +#define FESTIVE_SEASON "Festive Season" #define FRIDAY_13TH "Friday the 13th" //Human Overlays Indexes///////// diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index 5821f00588c..9ee13888517 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -80,6 +80,10 @@ flags_inv = 0 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) +/obj/effect/landmark/xmastree + name = "christmas tree spawner" + var/tree = /obj/structure/flora/tree/pine/xmas + /datum/round_event_control/santa name = "Santa is coming to town! (Christmas)" holidayID = CHRISTMAS diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 255069d3cc2..c064518a22e 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -316,6 +316,26 @@ /datum/holiday/xmas/greet() return "Have a merry Christmas!" +/datum/holiday/xmas/celebrate() + for(var/obj/effect/landmark/xmastree/XT in world) + new XT.tree(get_turf(XT)) + qdel(XT) + +/datum/holiday/festive_season + name = FESTIVE_SEASON + begin_day = 1 + begin_month = DECEMBER + end_day = 31 + +/datum/holiday/festive_season/celebrate() + for(var/obj/effect/landmark/xmastree/XT in world) + var/turf/t = get_turf(XT) + new /obj/structure/flora/tree/pine/xmas(t) + qdel(XT) + +/datum/holiday/festive_season/greet() + return "Have a nice festive season!" + /datum/holiday/boxing name = "Boxing Day" begin_day = 26 From 2e8ef6c35641ab02f06996f67e02007d5753312e Mon Sep 17 00:00:00 2001 From: Lzimann Date: Fri, 25 Nov 2016 19:25:48 -0200 Subject: [PATCH 2/3] Adds the spawner to the maps --- _maps/map_files/BirdStation/BirdStation.dmm | 8 +- .../map_files/DreamStation/dreamstation04.dmm | 24 ++--- .../EfficiencyStation/EfficiencyStation.dmm | 24 +++-- _maps/map_files/MetaStation/MetaStation.dmm | 1 + _maps/map_files/MiniStation/MiniStation.dmm | 11 +-- _maps/map_files/PubbyStation/PubbyStation.dmm | 89 ++++++++++--------- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 14 +-- code/modules/events/holiday/xmas.dm | 4 + 8 files changed, 87 insertions(+), 88 deletions(-) diff --git a/_maps/map_files/BirdStation/BirdStation.dmm b/_maps/map_files/BirdStation/BirdStation.dmm index aa63064c3b7..6528b47af5e 100644 --- a/_maps/map_files/BirdStation/BirdStation.dmm +++ b/_maps/map_files/BirdStation/BirdStation.dmm @@ -23262,6 +23262,12 @@ /area/maintenance/fore{ name = "Security Maintenance" }) +"ZyZ" = ( +/obj/effect/landmark/xmastree/rdrod, +/turf/open/floor/plasteel/warnwhite{ + dir = 8 + }, +/area/toxins/lab) "Zza" = ( /turf/open/space, /obj/machinery/porta_turret/syndicate{ @@ -65064,7 +65070,7 @@ aJt aKn aHu aEF -aMC +ZyZ aMC aOu aPk diff --git a/_maps/map_files/DreamStation/dreamstation04.dmm b/_maps/map_files/DreamStation/dreamstation04.dmm index 24220a42637..0a6d0f1b9cc 100644 --- a/_maps/map_files/DreamStation/dreamstation04.dmm +++ b/_maps/map_files/DreamStation/dreamstation04.dmm @@ -71623,14 +71623,9 @@ /turf/open/floor/plating, /area/maintenance/asmaint2) "cMe" = ( -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/stack/sheet/metal = 1, /obj/item/stack/rods = 2, /obj/item/weapon/shard = 2, "" = 3); - lootcount = 2; - name = "random material damage spawner" - }, -/mob/living/simple_animal/mouse, -/turf/open/floor/plating, -/area/maintenance/asmaint2) +/obj/effect/landmark/xmastree, +/turf/open/floor/plasteel/bar, +/area/crew_quarters/bar) "cMf" = ( /obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, @@ -71765,12 +71760,9 @@ /turf/open/floor/plating, /area/maintenance/asmaint2) "cMu" = ( -/mob/living/simple_animal/mouse, -/turf/open/floor/plating{ - broken = 1; - icon_state = "platingdmg2" - }, -/area/maintenance/asmaint2) +/obj/effect/landmark/xmastree, +/turf/open/floor/carpet, +/area/chapel/main) "cMv" = ( /obj/structure/girder, /turf/open/floor/plating/airless, @@ -90071,7 +90063,7 @@ bZI cba cfd cgN -cgN +cMu cfd clO bZI @@ -101359,7 +101351,7 @@ bsV bvb bor bsV -bor +cMe bor bEP bsV diff --git a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm index 65e30d793bd..a8304e0ef71 100644 --- a/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm +++ b/_maps/map_files/EfficiencyStation/EfficiencyStation.dmm @@ -13426,6 +13426,7 @@ }, /area/maintenance/fore) "azr" = ( +/obj/effect/landmark/xmastree/rdrod, /turf/open/floor/plasteel/warnwhite{ dir = 10 }, @@ -55555,11 +55556,11 @@ /turf/open/floor/plating, /area/shuttle/pod_2) "chK" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/shuttle/pod_2) +/obj/effect/landmark/xmastree, +/turf/open/floor/plasteel/bar, +/area/crew_quarters/bar{ + name = "\improper Maltese Falcon" + }) "chL" = ( /obj/machinery/light{ dir = 8 @@ -55805,12 +55806,9 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "cip" = ( -/obj/machinery/status_display, -/turf/closed/wall/shuttle{ - icon_state = "swall2"; - dir = 2 - }, -/area/shuttle/escape) +/obj/effect/landmark/xmastree, +/turf/open/floor/carpet, +/area/chapel/main) "ciq" = ( /obj/structure/chair, /turf/open/floor/mineral/titanium/blue, @@ -81055,7 +81053,7 @@ bMD bNT bPd bQu -bQu +cip bQu bQu bQu @@ -91042,7 +91040,7 @@ aWO aWM aWM aWM -aWM +chK aWM bcu bdy diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 6ff859496b9..7514d0d51c1 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -73035,6 +73035,7 @@ pixel_x = 0; pixel_y = 32 }, +/obj/effect/landmark/xmastree/rdrod, /turf/open/floor/plasteel/warnwhite{ dir = 8 }, diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index c5ee65a8f74..b0d9844b646 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -13656,12 +13656,9 @@ /turf/open/space, /area/space) "Er" = ( -/obj/structure/lattice, -/obj/structure/transit_tube{ - icon_state = "E-W-Pass" - }, -/turf/open/space, -/area/space) +/obj/effect/landmark/xmastree, +/turf/open/floor/plasteel/bar, +/area/crew_quarters/bar) "Es" = ( /obj/structure/lattice, /obj/structure/transit_tube/horizontal, @@ -50143,7 +50140,7 @@ kh td td td -td +Er td wj tt diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index cb5e568c87c..590019ae640 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -23982,6 +23982,7 @@ dir = 8; initialize_directions = 11 }, +/obj/effect/landmark/xmastree, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -54593,10 +54594,46 @@ /area/chapel/main{ name = "Monastery" }) -"chr" = ( -/obj/item/weapon/storage/toolbox/mechanical, -/turf/open/floor/plating, -/area/maintenance/aft) +"chk" = ( +/obj/structure/closet/firecloset, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/fsmaint) +"chl" = ( +/obj/structure/grille/broken, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/maintenance/fsmaint) +"chm" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/plasteel/showroomfloor, +/area/security/warden) +"chn" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/floor/plasteel, +/area/security/brig) +"cho" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/security/brig) +"chp" = ( +/obj/machinery/holopad, +/turf/open/floor/plasteel, +/area/quartermaster/miningdock) "chq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -54607,46 +54644,10 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"chp" = ( -/obj/machinery/holopad, -/turf/open/floor/plasteel, -/area/quartermaster/miningdock) -"cho" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) -"chn" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/plasteel, -/area/security/brig) -"chm" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/plasteel/showroomfloor, -/area/security/warden) -"chl" = ( -/obj/structure/grille/broken, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/fsmaint) -"chk" = ( -/obj/structure/closet/firecloset, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/fsmaint) +"chr" = ( +/obj/item/weapon/storage/toolbox/mechanical, +/turf/open/floor/plating, +/area/maintenance/aft) (1,1,1) = {" aaa diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index ad20d8bb7be..4c0ada72b83 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -33955,6 +33955,7 @@ }, /area/crew_quarters/hor) "bxm" = ( +/obj/effect/landmark/xmastree/rdrod, /turf/open/floor/plasteel/warnwhite{ dir = 5 }, @@ -52977,6 +52978,7 @@ /area/atmos) "clX" = ( /obj/effect/landmark/event_spawn, +/obj/effect/landmark/vr_spawn, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "clY" = ( @@ -56226,12 +56228,10 @@ /turf/open/space, /area/space/nearstation) "csT" = ( -/obj/structure/transit_tube{ - dir = 8; - icon_state = "Block" - }, -/turf/open/floor/plating, -/area/ai_monitored/turret_protected/aisat_interior) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/landmark/vr_spawn, +/turf/open/floor/plasteel/black, +/area/chapel/main) "csU" = ( /obj/structure/transit_tube/station/reverse, /turf/open/floor/plating, @@ -107841,7 +107841,7 @@ aEk aFB aHn aFB -aFB +csT aFB aLr aFB diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index 9ee13888517..ce2fbb2d6db 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -84,6 +84,10 @@ name = "christmas tree spawner" var/tree = /obj/structure/flora/tree/pine/xmas +/obj/effect/landmark/xmastree/rdrod + name = "festivus pole spawner" + tree = /obj/structure/festivus + /datum/round_event_control/santa name = "Santa is coming to town! (Christmas)" holidayID = CHRISTMAS From 68be7b1b16ad58a63299ca35845e3d416f9a066e Mon Sep 17 00:00:00 2001 From: Lzimann Date: Sat, 26 Nov 2016 21:36:55 -0200 Subject: [PATCH 3/3] Removes code from xmas celebrate() and move to the appropriate holiday datum. --- code/modules/holiday/holidays.dm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index c064518a22e..3f23b4743e6 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -316,11 +316,6 @@ /datum/holiday/xmas/greet() return "Have a merry Christmas!" -/datum/holiday/xmas/celebrate() - for(var/obj/effect/landmark/xmastree/XT in world) - new XT.tree(get_turf(XT)) - qdel(XT) - /datum/holiday/festive_season name = FESTIVE_SEASON begin_day = 1 @@ -328,9 +323,8 @@ end_day = 31 /datum/holiday/festive_season/celebrate() - for(var/obj/effect/landmark/xmastree/XT in world) - var/turf/t = get_turf(XT) - new /obj/structure/flora/tree/pine/xmas(t) + for(var/obj/effect/landmark/xmastree/XT in landmarks_list) + new XT.tree(get_turf(XT)) qdel(XT) /datum/holiday/festive_season/greet()