Wew lad (#305)

* not code stuff * other things * global vars, defines, helpers * onclick hud stuff, orphans, world.dm * controllers and datums * game folder * everything not client/mobs in modules * client folder * stage 1 mob stuff * simple animal things * silicons * carbon things * ayylmaos and monkeys * hyoomahn * icons n shit * sprite fixes * compile fixes * some fixes I cherrypicked. * qdel fixes * forgot brain refractors * based cyberboss. * you'd think github would suck less. * vendors * tweaks and specialty vendors. * map things * go away shitty omega * qdeletion spam supress, maps.txt tweaks * shuttle lights
2025-12-09 16:07:40 +00:00 · 2017-03-22 02:55:33 -05:00
parent fcc5e0e2f5
commit 7ad5e22830
12 changed files with 7332 additions and 127735 deletions
--- a/_maps/loadallmaps.dm
+++ b/_maps/loadallmaps.dm
@@ -2,9 +2,9 @@
 #include "map_files\debug\runtimestation.dmm"
 #include "map_files\Deltastation\DeltaStation2.dmm"
 #include "map_files\MetaStation\MetaStation.dmm"
-#include "map_files\OmegaStation\OmegaStation.dmm"
 #include "map_files\PubbyStation\PubbyStation.dmm"
 #include "map_files\TgStation\tgstation.2.1.3.dmm"
+#include "map_files\CitadelStation\CitadelStation-1.2.1.dmm"

 #include "map_files\generic\Centcomm.dmm"
 #include "map_files\generic\Fastload.dmm"
--- a/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm
+++ b/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm
--- a/code/citadel/cit_vendors.dm
+++ b/code/citadel/cit_vendors.dm
@@ -0,0 +1,100 @@
+#define STANDARD_CHARGE 1
+#define CONTRABAND_CHARGE 2
+#define COIN_CHARGE 3
+
+/obj/machinery/vending/kink
+	name = "KinkMate"
+	desc = "A vending machine for all your unmentionable desires."
+	icon = 'icons/obj/citvending.dmi'
+	icon_state = "kink"
+	product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
+	vend_reply = "Have fun, you shameless pervert!"
+	products = list(
+				/obj/item/clothing/under/maid = 5,
+				/obj/item/clothing/under/stripper_pink = 5,
+				/obj/item/clothing/under/stripper_green = 5,
+				/obj/item/weapon/dildo/custom = 5
+				)
+	contraband = list(/obj/item/weapon/restraints/handcuffs/fake/kinky = 5,
+				/obj/item/clothing/neck/petcollar = 5,
+				/obj/item/clothing/under/mankini = 1,
+				/obj/item/weapon/dildo/flared/huge = 1
+					)
+	premium = list()
+	refill_canister = /obj/item/weapon/vending_refill/kink
+
+/obj/machinery/vending/nazivend
+	name = "Nazivend"
+	desc = "A vending machine containing Nazi German supplies. A label reads: \"Remember the gorrilions lost.\""
+	icon = 'icons/obj/citvending.dmi'
+	icon_state = "nazi"
+	vend_reply = "SIEG HEIL!"
+	product_slogans = "Das Vierte Reich wird zuruckkehren!;ENTFERNEN JUDEN!;Billiger als die Juden jemals geben!;Rader auf dem adminbus geht rund und rund.;Warten Sie, warum wir wieder hassen Juden?- *BZZT*"
+	products = list(
+		/obj/item/clothing/head/stalhelm = 20,
+		/obj/item/clothing/head/panzer = 20,
+		/obj/item/clothing/suit/soldiercoat = 20,
+		/obj/item/clothing/under/soldieruniform = 20,
+		/obj/item/clothing/shoes/jackboots = 20
+		)
+	contraband = list(
+		/obj/item/clothing/head/naziofficer = 10,
+		/obj/item/clothing/suit/officercoat = 10,
+		/obj/item/clothing/under/officeruniform = 10,
+		/obj/item/clothing/suit/space/hardsuit/nazi = 3,
+		/obj/item/weapon/gun/energy/plasma/MP40k = 4
+		)
+	premium = list()
+
+	refill_canister = /obj/item/weapon/vending_refill/nazi
+
+/obj/machinery/vending/sovietvend
+	name = "KomradeVendtink"
+	desc = "Rodina-mat' zovyot!"
+	icon = 'icons/obj/citvending.dmi'
+	icon_state = "soviet"
+	vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
+	product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"
+	products = list(
+		/obj/item/clothing/under/soviet = 20,
+		/obj/item/clothing/head/ushanka = 20,
+		/obj/item/clothing/shoes/jackboots = 20,
+		/obj/item/clothing/head/squatter_hat = 20,
+		/obj/item/clothing/under/squatter_outfit = 20,
+		/obj/item/clothing/under/russobluecamooutfit = 20,
+		/obj/item/clothing/head/russobluecamohat = 20
+		)
+	contraband = list(
+		/obj/item/clothing/under/syndicate/tacticool = 4,
+		/obj/item/clothing/mask/balaclava = 4,
+		/obj/item/clothing/suit/russofurcoat = 4,
+		/obj/item/clothing/head/russofurhat = 4,
+		/obj/item/clothing/suit/space/hardsuit/soviet = 3,
+		/obj/item/weapon/gun/energy/laser/LaserAK = 4
+		)
+	premium = list()
+
+	refill_canister = /obj/item/weapon/vending_refill/soviet
+
+#undef STANDARD_CHARGE
+#undef CONTRABAND_CHARGE
+#undef COIN_CHARGE
+
+
+/obj/item/weapon/vending_refill/kink
+	machine_name 	= "KinkMate"
+	icon_state 		= "refill_kink"
+	charges 		= list(8, 5, 0)// of 20 standard, 12 contraband, 0 premium
+	init_charges 	= list(8, 5, 0)
+
+/obj/item/weapon/vending_refill/nazi
+	machine_name 	= "nazivend"
+	icon_state 		= "refill_nazi"
+	charges 		= list(33, 13, 0)
+	init_charges 	= list(33, 13, 0)
+
+/obj/item/weapon/vending_refill/soviet
+	machine_name 	= "sovietvend"
+	icon_state 		= "refill_soviet"
+	charges 		= list(47, 7, 0)
+	init_charges 	= list(47, 7, 0)
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -38,7 +38,7 @@ var/datum/controller/subsystem/atoms/SSatoms
 			if(!A.initialized)	//this check is to make sure we don't call it twice on an object that was created in a previous Initialize call
 				if(QDELETED(A))
 					if(!(NewQdelList[A.type]))
-						stack_trace("Found new qdeletion in type [A.type]!")
+						WARNING("Found new qdeletion in type [A.type]!")
 						NewQdelList[A.type] = TRUE
 					continue
 				var/start_tick = world.time
@@ -56,7 +56,7 @@ var/datum/controller/subsystem/atoms/SSatoms
 			if(!A.initialized)	//this check is to make sure we don't call it twice on an object that was created in a previous Initialize call
 				if(QDELETED(A))
 					if(!(NewQdelList[A.type]))
-						stack_trace("Found new qdeletion in type [A.type]!")
+						WARNING("Found new qdeletion in type [A.type]!")
 						NewQdelList[A.type] = TRUE
 					continue
 				var/start_tick = world.time
--- a/code/game/objects/effects/spawners/structure.dm
+++ b/code/game/objects/effects/spawners/structure.dm
@@ -8,7 +8,8 @@ again.
 	name = "map structure spawner"
 	var/list/spawn_list

-/obj/effect/spawner/structure/New()
+/obj/effect/spawner/structure/Initialize()
+	..()
 	if(spawn_list && spawn_list.len)
 		for(var/i = 1, i <= spawn_list.len, i++)
 			var/to_spawn = spawn_list[i]
@@ -30,4 +31,4 @@ again.
 	spawn_list = 	list(
 						/obj/structure/grille,
 						/obj/structure/window/reinforced/fulltile
-						)
+						)
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -278,7 +278,7 @@ var/global/dmm_suite/preloader/_preloader = new
 		instance_atom(members[index],members_attributes[index],xcrd,ycrd,zcrd,no_changeturf)

 		//custom CHECK_TICK here because we don't want things created while we're sleeping to not initialize
-		if(world.tick_usage > CURRENT_TICKLIMIT)
+		if(TICK_CHECK)
 			SSatoms.map_loader_stop()
 			stoplag()
 			SSatoms.map_loader_begin()
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -96,4 +96,4 @@
 	CHECK_TICK
 	preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser.
 	CHECK_TICK
-	qdel(mannequin)
+	qdel(mannequin)
--- a/code/modules/vehicles/speedbike.dm
+++ b/code/modules/vehicles/speedbike.dm
@@ -7,8 +7,8 @@
 	var/image/overlay = null

 /obj/vehicle/space/speedbike/buckle_mob(mob/living/M, force = 0, check_loc = 1)
- 	. = ..()
-		riding_datum = new/datum/riding/space/speedbike
+	. = ..()
+	riding_datum = new/datum/riding/space/speedbike

 /obj/vehicle/space/speedbike/New()
 	. = ..()
@@ -76,4 +76,4 @@
 	if(src.has_buckled_mobs())
 		for(var/atom/A in range(2, src))
 			if(!(A in src.buckled_mobs))
-				Bump(A)
+				Bump(A)
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -5,6 +5,7 @@
 		sustain the zombie, smashing open airlock doors and opening \
 		child-safe caps on bottles."
 	flags = NODROP|ABSTRACT|DROPDEL
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "bloodhand_left"
 	var/icon_left = "bloodhand_left"
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -430,7 +430,7 @@ ASSISTANT_CAP -1

 ## Starlight for exterior walls and breaches. Uncomment for starlight!
 ## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting
-#STARLIGHT
+STARLIGHT

 ## Uncomment to bring back old grey suit assistants instead of the now default rainbow colored assistants.
 #GREY_ASSISTANTS
--- a/config/maps.txt
+++ b/config/maps.txt
@@ -13,22 +13,22 @@ Format:
 endmap

 map tgstation2
-	default
 	#voteweight 1.5
 endmap

 map metastation
-	minplayers 25
-	#voteweight 0.5
+	minplayers 10
 endmap

 map pubbystation
+	minplayers 10
 endmap

-map omegastation
-	maxplayers 35
+map CitadelStation
+	default
+	#voteweight 1.5
 endmap

 map deltastation
-	minplayers 50
+	minplayers 10
 endmap
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -14,7 +14,8 @@

 // BEGIN_INCLUDE
 #include "_maps\__MAP_DEFINES.dm"
-#include "_maps\runtimestation.dm"
+#include "_maps\citadelstation.dm"
+#include "_maps\loadallmaps.dm"
 #include "code\_compile_options.dm"
 #include "code\world.dm"
 #include "code\__DATASTRUCTURES\heap.dm"
@@ -154,6 +155,7 @@
 #include "code\citadel\cit_kegs.dm"
 #include "code\citadel\cit_reagents.dm"
 #include "code\citadel\cit_uniforms.dm"
+#include "code\citadel\cit_vendors.dm"
 #include "code\citadel\organs\breasts.dm"
 #include "code\citadel\organs\eggsack.dm"
 #include "code\citadel\organs\genitals.dm"