makes the station christmassy at the press of a button! #16841

MadmanMartian · 2017-12-22T01:25:33Z

Makes any station christmassy at the press of a button!

Turns the hallways to snow, and decorates the walls along them with christmas lights
Adds a vg-themed christmas tree to the bar, sprite courtesy of @SkowronX
adds nice winter coats to most secure lockers!
fucks with all the lights on station, turning them to slightly dim lanterns!
sticks a santa hat on the corgi
only with minimal™️ lag!

IconDiffBot · 2017-12-22T01:25:39Z

Icons with diff:

icons/obj/flora/pinetrees.dmi

Key	Old	New	Status
spessmastree35			Created
spessmastree3			Created
spessmastree4			Created
spessmastree_off			Created
spessmastree6			Created
spessmastree24			Created
spessmastree14			Created
spessmastree8			Created
spessmastree25			Created
spessmastree11			Created
spessmastree2			Created
spessmastree32			Created
spessmastree47			Created
spessmastree29			Created
spessmastree12			Created
spessmastree40			Created
spessmastree33			Created
spessmastree38			Created
spessmastree17			Created
spessmastree28			Created
spessmastree			Created
spessmastree43			Created
spessmastree23			Created
spessmastree15			Created
spessmastree36			Created
spessmastree34			Created
spessmastree13			Created
spessmastree18			Created
spessmastree10			Created
spessmastree39			Created
spessmastree31			Created
spessmastree45			Created
spessmastree21			Created
spessmastree27			Created
spessmastree41			Created
spessmastree42			Created
spessmastree5			Created
spessmastree7			Created
spessmastree30			Created
spessmastree37			Created
spessmastree46			Created
spessmastree9			Created
spessmastree19			Created
spessmastree22			Created
spessmastree20			Created
spessmastree1			Created
spessmastree16			Created
spessmastree44			Created
spessmastree26			Created

gbasood · 2017-12-22T02:16:41Z

jesus christ what
you're going to change the entire station to unsimulated turfs?

gbasood

hoo boy we got some problems

gbasood · 2017-12-22T02:22:50Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+			for(var/obj/machinery/light/L in to_snow)
+				qdel(L)
+
+	for(var/turf/T in world)


no
do not loop through all turfs in world
there are better ways to do this

gbasood · 2017-12-22T02:23:07Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+		var/area/to_snow = locate(A)
+		if(to_snow)
+			for(var/turf/simulated/floor/F in to_snow)
+				F.ChangeTurf(/turf/unsimulated/floor/snow, tell_universe = 0)


you're turning literally every simulated turf on the station into unsimulated
why would you do this
don't do this

gbasood · 2017-12-22T02:24:49Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+			if(/obj/structure/closet/secure_closet/hop2)
+				new /obj/item/clothing/suit/wintercoat/hop(S)
+			if(/obj/structure/closet/secure_closet/hos)
+				new /obj/item/clothing/suit/wintercoat/security/hos


forgot location

gbasood · 2017-12-22T02:25:00Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+				new /obj/item/clothing/suit/wintercoat/medical(S)
+			if(/obj/structure/closet/secure_closet/CMO)
+				new /obj/item/clothing/suit/wintercoat/cmo(S)
+			if(/obj/structure/closet/secure_closet/engineering_chief)


forgot location

gbasood · 2017-12-22T02:27:11Z

code/modules/admin/admin.dm

@@ -850,6 +850,7 @@ var/global/floorIsLava = 0
 			<A href='?src=\ref[src];secretsfun=supermattercascade'>Start a Supermatter Cascade</A><BR>
 			<A href='?src=\ref[src];secretsfun=meteorstorm'>Trigger an undending Meteor Storm</A><BR>
 			<A href='?src=\ref[src];secretsfun=halloween'>Awaken the damned for some spooky shenanigans</A><BR>
+			<A href='?src=\ref[src];secretsfun=christmas_vic'>Make the station old-timey and christmasy</A><BR>


I mean really only one of these applies

gbasood · 2017-12-22T03:03:23Z

🤔
You could have fixed this to be usable easily

MadmanMartian · 2017-12-22T11:44:48Z

was at a bit of a low point last night, sorry. I'll get it done

…makes it all comfier

small-boss · 2017-12-23T16:01:30Z

I was sad that no one is gonna make a christmas version of the maps like last year, but this is even better

gbasood · 2017-12-23T16:23:34Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+				qdel(L)
+
+	for(var/area/A in areas)
+		if(A.z == target_zlevel)


Does anyone know if this will work for things that are in space on zlevel 1?

The z coordinate here is set to the first turf on the map, so the entire space area will be counted for example (unless that's excluded in this list)

But yes, this will work @gbasood .

gbasood · 2017-12-23T16:26:40Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+		var/mob/catch_the_dog = locate(/mob/living/simple_animal/corgi/Ian) in santadog
+		if(catch_the_dog)
+			new /mob/living/simple_animal/corgi/Ian/santa(get_turf(catch_the_dog))
+			qdel(catch_the_dog)


what have you done to Ian you monster

I saw there was a subtype of Ian called santa Ian, so pupsnatched them and replaced them with a doppelganger.

The only thing that subtype does is change the hat he has. Meanwhile you'll delete any other hats or clothing items ian has by doing this. Not amazing.

gbasood

The performance changes look much better to me this time around. I'll try to nag another collab to take a look

PJB3005

RIP christmas.

Also space your damn code out vertically we're not TG clockcult.

PJB3005 · 2017-12-23T16:50:35Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+/datum/universal_state/auldlangsyne/OnEnter()
+	var/target_zlevel = map.zMainStation
+
+	to_chat(target_zlevel, "<span class='sinister'>There is a certain chill to the air, as bells ring faintly in the distance...</span>")


This... doesn't work. zMainStation is a number.

check to_chat, you can give it an integer and it will to_chat things only on that z level. #15589

What the fuck. That's horrible code.

@Intigracy I'm putting you responsive for merging that shitcode.

You're not using it on my watch though because that's just a giant train wreck waiting to spam everybody's client because of a type error.

PJB3005 · 2017-12-23T16:51:17Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+	//Snow up the halls
+	for(var/A in typesof(/area/hallway))
+		var/area/to_snow = locate(A)
+		if(to_snow)


Avoid indentation:

if (!to_snow) continue

PJB3005 · 2017-12-23T18:09:13Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+				qdel(L)
+
+	for(var/area/A in areas)
+		if(A.z == target_zlevel)


The z coordinate here is set to the first turf on the map, so the entire space area will be counted for example (unless that's excluded in this list)

But yes, this will work @gbasood .

PJB3005 · 2017-12-23T18:10:24Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+				if(istype(T, /turf/simulated/wall) && !istype(T, /turf/simulated/wall/r_wall))
+					T.ChangeTurf(/turf/simulated/wall/mineral/wood, tell_universe = 0)
+			for(var/obj/item/device/flashlight/F in A)
+				var/obj/item/candle/C = new /obj/item/candle(F.loc)


Pretty sure this'd mess up any flashlights in people's pockets or hands.

shouldn't and doesn't, as it wouldn't be in the areas contents, but in the humans contents, which isn't iterated through. Tested it, did not lose my flashlight I was holding.

Ah, didn't catch that. Ok then.

PJB3005 · 2017-12-23T18:10:48Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+				C.light(quiet = 1)
+				qdel(F)
+			for(var/obj/machinery/light/L in A)
+				var/turf/T = get_turf(L)


Why use get_turf instead of loc?

PJB3005 · 2017-12-23T18:11:15Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+			for(var/obj/structure/closet/secure_closet/S in A)
+				switch(S.type)
+					if(/obj/structure/closet/secure_closet/captains)
+						new /obj/item/clothing/suit/wintercoat/captain(S)


These spawns like this won't work properly if the locker's open.

you then close it, and open it again.

Magic of christmas!

(Can't find anything that can help 'place' something in a locker)

PJB3005 · 2017-12-23T18:12:40Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+		for(var/turf/simulated/floor/F in christmas_bar)
+			if(!F.has_dense_content() && istype(F, /turf/simulated/floor/wood))
+				valid.Add(F)
+		new/obj/structure/snow_flora/tree/pine/xmas/vg/(pick(valid))


This'll runtime if there's no valid positions.

PJB3005 · 2017-12-23T18:12:59Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+		new/obj/structure/snow_flora/tree/pine/xmas/vg/(pick(valid))
+
+
+	var/area/santadog = locate(/area/crew_quarters/hop)


Why not just locate ian in world?

Would that not be expensive?

1.536 2.834 2.873 - checking corgi in world
1.540 2.694 2.731 - checking corgi in HoP office

PJB3005 · 2017-12-23T18:14:30Z

code/game/gamemodes/endgame/xmas/victorianstation.dm

+		var/mob/catch_the_dog = locate(/mob/living/simple_animal/corgi/Ian) in santadog
+		if(catch_the_dog)
+			new /mob/living/simple_animal/corgi/Ian/santa(get_turf(catch_the_dog))
+			qdel(catch_the_dog)


The only thing that subtype does is change the hat he has. Meanwhile you'll delete any other hats or clothing items ian has by doing this. Not amazing.

PJB3005 · 2017-12-23T18:15:39Z

goon/code/datums/browserOutput.dm

@@ -250,14 +250,14 @@ For the main html chat area
 /proc/to_chat(target, message)
 	//Ok so I did my best but I accept that some calls to this will be for shit like sound and images
 	//It stands that we PROBABLY don't want to output those to the browser output so just handle them here
-	if (istype(message, /image) || istype(message, /sound) || istype(target, /savefile) || !(ismob(target) || islist(target) || isclient(target) || istype(target, /datum/log) || target == world))
+	if (IsInteger(target)) //Passing it to an entire z level


This is just waaay too dangerous and error prone. Make it do this when it's passed an actual z level datum only.

A zLevel datum is just stats used to construct that z level in /datum/map/proc/addZLevel(), it's not used for storage or logging, so can't be referred or used to reference back to a mob or target

They definitely are not. See

vgstation13/code/__HELPERS/unsorted.dm

Lines 1327 to 1337 in bd4f283

/proc/get_z_level(var/atom/A)

var/z

if(istype(A, /atom/movable))

var/turf/T = get_turf(A)

if(!T)

return null

z = T.z

else

z = A.z

. = map.zLevels[z]

and its usages.

… map datums zlevel list. Much more sensible

PJB3005

There's still issues but I'll let it slide because christmas I guess.

Blithering · 2017-12-24T23:39:13Z

Will this be merged in time for christmas?

MadmanMartian · 2017-12-24T23:57:03Z

Well it needs to be merged within the next 4 minutes in that case

makes the station christmassy at the press of a button!

79b87b5

gbasood added the Content Adds something. Neat! label Dec 22, 2017

gbasood suggested changes Dec 22, 2017

View reviewed changes

MadmanMartian closed this Dec 22, 2017

MadmanMartian deleted the vg_christmas branch December 22, 2017 03:01

MadmanMartian restored the vg_christmas branch December 22, 2017 11:45

MadmanMartian reopened this Dec 22, 2017

jknpj added the Mapping (General 🗺️) This applies to every map really. label Dec 22, 2017

MadmanMartian added 3 commits December 22, 2017 19:37

addresses concerns, turns a corgi into a santas helper, adds sounds, …

7915ea3

…makes it all comfier

scraps the old idea entirely, removes un-necessary variables.

fe99d7d

lamps become candles now

9af5526

gbasood reviewed Dec 23, 2017

View reviewed changes

gbasood approved these changes Dec 23, 2017

View reviewed changes

PJB3005 suggested changes Dec 23, 2017

View reviewed changes

MadmanMartian added 3 commits December 23, 2017 20:13

optimizations, reparations

3c9a5da

changes the zlevel check from looking at an integer to looking at the…

5209cff

… map datums zlevel list. Much more sensible

some more verticality

b974214

PJB3005 approved these changes Dec 24, 2017

View reviewed changes

PJB3005 merged commit 89839c7 into vgstation-coders:Bleeding-Edge Dec 24, 2017

MadmanMartian deleted the vg_christmas branch December 25, 2017 00:00

		new/obj/structure/snow_flora/tree/pine/xmas/vg/(pick(valid))


		var/area/santadog = locate(/area/crew_quarters/hop)

	/proc/get_z_level(var/atom/A)
	var/z
	if(istype(A, /atom/movable))
	var/turf/T = get_turf(A)
	if(!T)
	return null
	z = T.z
	else
	z = A.z

	. = map.zLevels[z]

makes the station christmassy at the press of a button! #16841

makes the station christmassy at the press of a button! #16841

Conversation

MadmanMartian commented Dec 22, 2017 • edited

IconDiffBot commented Dec 22, 2017

gbasood commented Dec 22, 2017

gbasood left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gbasood commented Dec 22, 2017 • edited

MadmanMartian commented Dec 22, 2017

small-boss commented Dec 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gbasood left a comment

Choose a reason for hiding this comment

PJB3005 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MadmanMartian Dec 23, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MadmanMartian Dec 23, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PJB3005 left a comment

Choose a reason for hiding this comment

Blithering commented Dec 24, 2017

MadmanMartian commented Dec 24, 2017

MadmanMartian commented Dec 22, 2017 •

edited

gbasood commented Dec 22, 2017 •

edited

MadmanMartian Dec 23, 2017 •

edited

MadmanMartian Dec 23, 2017 •

edited