Merge pull request #13 from Citadel-Station-13/master

Updating fork
2017-10-09 20:06:46 -07:00
parent 094e26f330 10cecff362
commit e2b786a328
15 changed files with 3060 additions and 1042 deletions
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE 
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aaa" = (
 /turf/open/space/basic,
 /area/space)
@@ -95768,7 +95768,7 @@
 	dir = 1;
 	pixel_y = -22
 	},
-/obj/item/twohanded/required/kirbyplants/random,
+/obj/machinery/vending/kink,
 /turf/open/floor/wood{
 	icon_state = "wood-broken3"
 	},
@@ -109399,6 +109399,14 @@
 	},
 /turf/open/space/basic,
 /area/space)
+"YGJ" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
+"YGK" = (
+/obj/machinery/vending/kink,
+/turf/open/floor/plating,
+/area/crew_quarters/abandoned_gambling_den)

 (1,1,1) = {"
 aaa
@@ -133734,7 +133742,7 @@ dmb
 dnA
 doK
 dqw
-diJ
+YGK
 aJm
 aHW
 aaf
@@ -139805,7 +139813,7 @@ aib
 asx
 atw
 auQ
-aic
+YGJ
 awX
 aye
 azn
@@ -1,4 +1,4 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE 
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aaa" = (
 /turf/open/space/basic,
 /area/space)
@@ -28435,7 +28435,7 @@
 	},
 /area/security/checkpoint/engineering)
 "bcO" = (
-/obj/structure/easel,
+/obj/machinery/vending/kink,
 /turf/open/floor/plating{
 	icon_state = "platingdmg3"
 	},
@@ -64043,10 +64043,10 @@
 /turf/open/space,
 /area/space)
 "ctn" = (
-/obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "cto" = (
@@ -80969,7 +80969,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port)
 "dbl" = (
-/obj/structure/easel,
+/obj/machinery/vending/kink,
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "dbm" = (
@@ -1,4 +1,13 @@
 /area/maintenance/bar
 	name = "Maintenance Bar"
 	icon = 'code/citadel/icons/areas.dmi'
-	icon_state = "maintbar"
+	icon_state = "maintbar"
+
+/area/maintenance/bar/cafe
+	name = "Abandoned Cafe"
+
+/area/crew_quarters/theatre/clown
+	name = "Clown's Office"
+
+/area/crew_quarters/theatre/mime
+	name = "Mime's Office"
@@ -388,6 +388,10 @@
 			else
 				files.known_designs -= D.id

+/obj/machinery/autolathe/hacked/Initialize()
+	. = ..()
+	adjust_hacked(TRUE)
+
 //Called when the object is constructed by an autolathe
 //Has a reference to the autolathe so you can do !!FUN!! things with hacked lathes
 /obj/item/proc/autolathe_crafted(obj/machinery/autolathe/A)
@@ -234,6 +234,8 @@
 		for(var/obj/machinery/doorButtons/D in GLOB.machines)
 			D.removeMe(src)
 	qdel(note)
+	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
+	diag_hud.remove_from_hud(src)
 	return ..()

 /obj/machinery/door/airlock/handle_atom_del(atom/A)
@@ -100,8 +100,8 @@
 	if(do_after(user, 30, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
-		src.target = AM
-		forceMove(null)	//Yep
+		target = AM
+		moveToNullspace()	//Yep

 		if(istype(AM, /obj/item)) //your crappy throwing star can't fly so good with a giant brick of c4 on it.
 			var/obj/item/I = AM
@@ -52,10 +52,12 @@
 		return
 	..() //contents explosion
 	if(target == src)
+		obj_integrity = 0
 		qdel(src)
 		return
 	switch(severity)
 		if(1)
+			obj_integrity = 0
 			qdel(src)
 		if(2)
 			take_damage(rand(100, 250), BRUTE, "bomb", 0)
@@ -391,7 +391,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	if(holder)
 		holder.check_antagonists()
 		log_admin("[key_name(usr)] checked antagonists.")	//for tsar~
-		if(!isobserver(usr))
+		if(!isobserver(usr) && SSticker.HasRoundStarted())
 			message_admins("[key_name_admin(usr)] checked antagonists.")
 	SSblackbox.add_details("admin_verb","Check Antagonists") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

@@ -19,12 +19,11 @@
 	player_mind.active = TRUE

 	var/list/spawn_locs = list()
-	for(var/obj/effect/landmark/xeno_spawn/L in GLOB.landmarks_list)
-		if(isturf(L.loc))
-			var/turf/T = L.loc
-			var/light_amount = T.get_lumcount()
-			if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
-				spawn_locs += T
+	for(var/X in GLOB.xeno_spawn)
+		var/turf/T = X
+		var/light_amount = T.get_lumcount()
+		if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
+			spawn_locs += T

 	if(!spawn_locs.len)
 		message_admins("No valid spawn locations found, aborting...")
@@ -404,6 +404,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 	desc = "An additional 15-round 9mm magazine, compatible with the Stetchkin APS pistol, found in the Spetsnaz Pyro bundle."
 	item = /obj/item/ammo_box/magazine/pistolm9mm
 	cost = 2
+	include_modes = list(/datum/game_mode/nuclear)

 /datum/uplink_item/ammo/bolt_action
 	name = "Surplus Rifle Clip"
@@ -0,0 +1,13 @@
+author: "deathride58"
+delete-after: True
+changes: 
+  - rscadd: "Readded maint bar and maint dorms from my previous map edit PR"
+  - rscadd: "Added an Abandoned Cafe to Boxstation, right above the new Clown and Mime offices."
+  - tweak: "Cit's maintenance bar is now all access."
+  - tweak: "The kitchen's deep fryers have been moved into the kitchen's island counter, just as the deep fryer was on old Hippie."
+  - tweak: "Recreated several changes from old Hippie's Boxstation. They are as follows."
+  - rscadd: "Added Clown and Mime offices to Boxstation. The Clown and Mime will now spawn there instead of the Theatre."
+  - tweak: "There is now a maintenance tunnel connecting the Captain's office to the meeting room."
+  - tweak: "The Gravity Generator has been moved to Engineering, and the Vault has been moved to the Gravity Generator's former place."
+  - tweak: "Added an extra airlock on the west side of the bar."
+  - tweak: "Added an extra airlock on the west side of Bar Storage, connecting it with the rest of the bar."
@@ -0,0 +1,4 @@
+author: "Naksu"
+delete-after: True
+changes: 
+  - bugfix: "Fixes to door/airlock deletion routines."
@@ -0,0 +1,4 @@
+author: "improvedname"
+delete-after: True
+changes: 
+  - bugfix: "9mm doesn't longer appear in traitor surplus crates"
@@ -0,0 +1,4 @@
+author: "deathride58"
+delete-after: True
+changes: 
+  - rscadd: "Readded kinkmates to Deltastation and Metastation."