Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed

Conflicts: _maps/map_files/DiscStation/DiscStation.dmm
2026-08-28 15:47:15 +01:00 · 2015-10-23 01:01:02 +11:00
parent 1dee35a5f9 c7670dc627
commit 0d67f24e33
35 changed files with 1411 additions and 1258 deletions
@@ -97,7 +97,7 @@
 	var/msg = input("Message:", text("Enter the text you wish to appear to everyone within view:")) as text
 	if (!msg)
 		return
-	for(var/mob/living/M in view(range,A))
+	for(var/mob/M in view(range,A))
 		M << msg

 	log_admin("LocalNarrate: [key_name(usr)] at ([get_area(A)]): [msg]")
@@ -909,4 +909,4 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
 	<input type="submit" value="Save">
 	</form></body></html>
 	"}
-	usr << browse(dat, "window=dressup;size=550x600")
+	usr << browse(dat, "window=dressup;size=550x600")
@@ -107,11 +107,11 @@ var/next_external_rsc = 0
 	directory[ckey] = src

 	//Admin Authorisation
-	if(config.autoadmin)
+	if(protected_config.autoadmin)
 		if(!admin_datums[ckey])
 			var/datum/admin_rank/autorank
 			for(var/datum/admin_rank/R in admin_ranks)
-				if(R.name == config.autoadmin_rank)
+				if(R.name == protected_config.autoadmin_rank)
 					autorank = R
 					break
 			if(!autorank)
@@ -45,7 +45,6 @@
 		W.loc = src
 		r_hand = W
 		W.layer = 20
-//		r_hand.screen_loc = ui_rhand
 		W.equipped(src,slot_r_hand)
 		if(client)	client.screen |= W
 		if(pulling == W) stop_pulling()
@@ -93,7 +92,7 @@


 //Drops the item in our left hand
-/mob/proc/drop_l_hand() //I really fucking wonder why this proc had an argument holy shit.
+/mob/proc/drop_l_hand()
 	if(!loc.allow_drop())
 		return
 	return unEquip(l_hand) //All needed checks are in unEquip
@@ -103,11 +102,11 @@
 /mob/proc/drop_r_hand()
 	if(!loc.allow_drop())
 		return
-	return unEquip(r_hand) //Why was this not calling unEquip in the first place jesus fuck.
+	return unEquip(r_hand)


 //Drops the item in our active hand.
-/mob/proc/drop_item() //THIS. DOES. NOT. NEED. AN. ARGUMENT.
+/mob/proc/drop_item()
 	if(hand)	return drop_l_hand()
 	else		return drop_r_hand()

@@ -84,7 +84,7 @@
 				if(4)
 					emote("drool")
 				if(5)
-					say(pick("REMOVE SINGULARITY", "INSTLL TEG", "TURBIN IS BEST ENGIENE", "SOLIRS CAN POWER THE HOLE STATION ANEWAY"))
+					say(pick("REMOVE SINGULARITY", "INSTLL TEG", "TURBIN IS BEST ENGIENE", "SOLIRS CAN POWER THE HOLE STATION ANEWAY", "parasteng was best"))


 /mob/living/carbon/human/handle_mutations_and_radiation()
@@ -13,9 +13,6 @@
 	use_skintones = 1

 /datum/species/human/qualifies_for_rank(rank, list/features)
-	if(!config.mutant_humans) //No mutie scum here
-		return 1
-
 	if((!features["tail_human"] || features["tail_human"] == "None") && (!features["ears"] || features["ears"] == "None"))
 		return 1	//Pure humans are always allowed in all roles.

@@ -78,7 +78,7 @@
 			head.screen_loc = ui_drone_head
 			client.screen += head

-		var/image/head_overlay = head.build_worn_icon(state = icon_state, default_layer = DRONE_HEAD_LAYER, default_icon_file = 'icons/mob/head.dmi')
+		var/image/head_overlay = head.build_worn_icon(state = head.icon_state, default_layer = DRONE_HEAD_LAYER, default_icon_file = 'icons/mob/head.dmi')
 		head_overlay.pixel_y += -15

 		drone_overlays[DRONE_HEAD_LAYER]	= head_overlay
@@ -161,4 +161,4 @@


 /mob/living/simple_animal/drone/generateStaticOverlay()
-	return
+	return
@@ -114,11 +114,13 @@
 			//second, spin a sticky spiderweb on this tile
 			var/obj/effect/spider/stickyweb/W = locate() in get_turf(src)
 			if(!W)
-				Web()
+				spawn()
+					Web()
 			else
 				//third, lay an egg cluster there
 				if(fed)
-					LayEggs()
+					spawn()
+						LayEggs()
 				else
 					//fourthly, cocoon any nearby items so those pesky pinkskins can't use them
 					for(var/obj/O in can_see)
@@ -136,7 +138,8 @@

 		else if(busy == MOVING_TO_TARGET && cocoon_target)
 			if(get_dist(src, cocoon_target) <= 1)
-				Wrap()
+				spawn()
+					Wrap()

 	else
 		busy = 0
@@ -11,7 +11,7 @@
 	name = "photocopier"
 	desc = "Used to copy important documents and anatomy studies."
 	icon = 'icons/obj/library.dmi'
-	icon_state = "bigscanner"
+	icon_state = "photocopier"
 	anchored = 1
 	density = 1
 	use_power = 1
@@ -228,7 +228,7 @@
 			copy = O
 			O.loc = src
 			user << "<span class='notice'>You insert [O] into [src].</span>"
-			flick("bigscanner1", src)
+			flick("photocopier1", src)
 			updateUsrDialog()
 		else
 			user << "<span class='warning'>There is already something in [src]!</span>"
@@ -240,7 +240,7 @@
 			photocopy = O
 			O.loc = src
 			user << "<span class='notice'>You insert [O] into [src].</span>"
-			flick("bigscanner1", src)
+			flick("photocopier1", src)
 			updateUsrDialog()
 		else
 			user << "<span class='warning'>There is already something in [src]!</span>"
@@ -141,7 +141,7 @@

 			var/mob/living/new_mob

-			var/randomize = pick("monkey","robot","slime","xeno","human","animal")
+			var/randomize = pick("monkey","robot","slime","xeno","humanoid","animal")
 			switch(randomize)
 				if("monkey")
 					new_mob = new /mob/living/carbon/monkey(M.loc)
@@ -216,7 +216,7 @@
 							if("butterfly")	new_mob = new /mob/living/simple_animal/butterfly(M.loc)
 							else			new_mob = new /mob/living/simple_animal/chick(M.loc)
 					new_mob.languages |= HUMAN
-				if("human")
+				if("humanoid")
 					new_mob = new /mob/living/carbon/human(M.loc)

 					var/datum/preferences/A = new()	//Randomize appearance for the human
@@ -569,4 +569,12 @@
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 150, MAT_GLASS = 125)
 	build_path = /obj/item/weapon/hand_labeler
-	category = list("initial", "Electronics")
+	category = list("initial", "Electronics")
+
+/datum/design/geiger
+	name = "Geiger counter"
+	id = "geigercounter"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 150, MAT_GLASS = 150)
+	build_path = /obj/item/device/geiger_counter
+	category = list("initial", "Tools")