Merge branch 'master' of git://github.com/Baystation12/Baystation12

2026-08-22 19:47:22 +01:00 · 2012-06-08 19:42:12 +03:00
parent 22bc66f963 f17525173c
commit 789eb185c3
559 changed files with 29368 additions and 22209 deletions
@@ -46,8 +46,8 @@



-	var/husk = (mutations & HUSK)
-	//var/obese = (mutations & FAT)
+	var/husk = (HUSK in mutations)
+	//var/obese = (FAT in mutation)

 	stand_icon.Blend(new /icon('birdman.dmi', "chest_[g]_s"), ICON_OVERLAY)
 	lying_icon.Blend(new /icon('birdman.dmi', "chest_[g]_l"), ICON_OVERLAY)
@@ -184,7 +184,7 @@
 	var/is_speaking_taj = 0
 	if(copytext(message, 1, 3) == ":j" || copytext(message, 1, 3) == ":J")
 		message = copytext(message, 3)
-		if(taj_talk_understand)
+		if(taj_talk_understand || universal_speak)
 			is_speaking_taj = 1

 	if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
@@ -403,7 +403,7 @@

 	for (var/mob/M in listening)
 		//if speaking in tajaran, only let other tajs understand
-		if ( M.say_understands(src) && (M.taj_talk_understand || !is_speaking_taj)  )
+		if ( M.say_understands(src) && (M.taj_talk_understand || !is_speaking_taj || M.universal_speak)  )
 			heard_a += M
 		else
 			heard_b += M
@@ -55,7 +55,7 @@
 	O.update_body()
 	O.update_face()
 	spawn(1)
-		O.update_clothing()
+		O.rebuild_appearance()
 	O << "<B>You are now a Tajara.</B>"
 	spawn(0)//To prevent the proc from returning null.
 		del(src)
@@ -22,11 +22,17 @@
 		if(!lying_icon)
 			lying_icon = new /icon('tajaran.dmi', "body_[g]_l")
 		icon = stand_icon
-		update_clothing()
+		rebuild_appearance()
 		src << "\blue Your icons have been generated!"

 	..()

+/mob/living/carbon/human/tajaran/rebuild_appearance()
+	update_clothing()
+
+/mob/living/carbon/human/tajaran/update_body_appearance()
+	update_clothing()
+
 /mob/living/carbon/human/tajaran/update_clothing()
 //	..()

@@ -37,19 +43,19 @@

 	// lol
 	var/fat = ""
-	/*if (mutations & FAT)
+	/*if (FAT in mutation)
 		fat = "fat"*/
 /*
-	if (mutations & HULK)
+	if (HULK in mutations)
 		overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat][!lying ? "_s" : "_l"]")
 */
-	if (mutations & COLD_RESISTANCE)
+	if (COLD_RESISTANCE in mutations)
 		overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[fat][!lying ? "_s" : "_l"]")

-	if (mutations & TK)
+	if (TK in mutations)
 		overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[fat][!lying ? "_s" : "_l"]")

-	if (mutations & LASER)
+	if (LASER in mutations)
 		overlays += image("icon" = 'genetics.dmi', "icon_state" = "lasereyes[!lying ? "_s" : "_l"]")

 	if (mutantrace)
@@ -74,6 +80,18 @@
 					del(stand_icon)
 				if(lying_icon)
 					del(lying_icon)
+			if("skrell")
+				body_overlays_standing += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_[gender]_s")
+				body_overlays_lying	   += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_[gender]_l")
+// This needs to be matched up with humans, but I'm too lazy right now
+//				if(face_standing)
+//					del(face_standing)
+//				if(face_lying)
+//					del(face_lying)
+				if(stand_icon)
+					del(stand_icon)
+				if(lying_icon)
+					del(lying_icon)
 			if("plant")
 				if(stat != 2) //if not dead, that is
 					overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")
@@ -121,21 +139,21 @@
 	if (lying)
 		icon = lying_icon

-		overlays += body_lying
+		overlays += damageicon_lying

 		if (face_lying)
 			overlays += face_lying
 	else
 		icon = stand_icon

-		overlays += body_standing
+		overlays += damageicon_standing

 		if (face_standing)
 			overlays += face_standing

 	// Uniform
 	if(w_uniform)
-		/*if (mutations & FAT && !(w_uniform.flags & ONESIZEFITSALL))
+		/*if ((FAT in mutations) && !(w_uniform.flags & ONESIZEFITSALL))
 			src << "\red You burst out of the [w_uniform.name]!"
 			var/obj/item/clothing/c = w_uniform
 			u_equip(c)
@@ -151,7 +169,7 @@
 			var/t1 = w_uniform.color
 			if (!t1)
 				t1 = icon_state
-			/*if (mutations & FAT)
+			/*if (FAT in mutations)
 				overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!lying ? "_s" : "_l"]", "layer" = MOB_LAYER)
 			else*/
 			overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
@@ -263,7 +281,7 @@

 	var/tail_shown = 1
 	if (wear_suit)
-		/*if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL))
+		/*if ((FAT in mutations) && !(wear_suit.flags & ONESIZEFITSALL))
 			src << "\red You burst out of the [wear_suit.name]!"
 			var/obj/item/clothing/c = wear_suit
 			u_equip(c)
@@ -457,8 +475,8 @@



-	var/husk = (mutations & HUSK)
-	//var/obese = (mutations & FAT)
+	var/husk = (HUSK in mutations)
+	//var/obese = (FAT in mutations)

 	stand_icon.Blend(new /icon('tajaran.dmi', "chest_[g]_s"), ICON_OVERLAY)
 	lying_icon.Blend(new /icon('tajaran.dmi', "chest_[g]_l"), ICON_OVERLAY)
@@ -35,7 +35,7 @@
 	var/is_speaking_taj = 0
 	if(copytext(message, 1, 4) == ":j ")
 		message = copytext(message, 4)
-		if(taj_talk_understand)
+		if(taj_talk_understand || universal_speak)
 			is_speaking_taj = 1

 	if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)&&src.wear_mask:voice=="Unknown")
@@ -84,7 +84,7 @@
 	var/list/heard_b = list() // didn't understand us

 	for (var/mob/M in listening)
-		if ( M.say_understands(src) && (M.taj_talk_understand || !is_speaking_taj)  )
+		if ( M.say_understands(src) && (M.taj_talk_understand || !is_speaking_taj || M.universal_speak)  )
 			heard_a += M
 		else
 			heard_b += M
@@ -21,12 +21,17 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/items						// List of items
 	var/list/ItemList				// Parsed list of items
 	var/uses 						// Numbers of crystals
+	var/uplink_data					// designated uplink items
 	// List of items not to shove in their hands.
 	var/list/NotInHand = list(/obj/machinery/singularity_beacon/syndicate)

 	New()
-		welcome = ticker.mode.uplink_welcome
-		items = dd_replacetext(ticker.mode.uplink_items, "\n", "")	// Getting the text string of items
+		if(!welcome)
+			welcome = ticker.mode.uplink_welcome
+		if(!uplink_data)
+			uplink_data = ticker.mode.uplink_items
+
+		items = dd_replacetext(uplink_data, "\n", "")	// Getting the text string of items
 		ItemList = dd_text2list(src.items, ";")	// Parsing the items text string
 		uses = ticker.mode.uplink_uses

@@ -312,7 +317,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/temp = null 			//Temporary storage area for a message offering the option to destroy the radio
 	var/selfdestruct = 0		//Set to 1 while the radio is self destructing itself.
 	var/obj/item/device/radio/origradio = null
-	flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
+	flags = FPRINT | TABLEPASS | CONDUCT
+	slot_flags = SLOT_BELT
 	w_class = 2.0
 	item_state = "radio"
 	throwforce = 5
@@ -1,8 +1,9 @@
 //May expand later, but right now it just repairs lights.
 /obj/item/device/portalathe
-	name = "\improper Portable Autolathe"
-	desc = "It blinks and has an antenna on it.  It must be advanced."
-	icon_state = "t-ray0"
+	name = "portable autolathe"
+	desc = "A device which can repair broken lights instantly. Must be advanced."
+	icon = 'janitor.dmi'
+	icon_state = "portalathe"

 	afterattack(var/atom/target, mob/user as mob)
 		if(!target || !user)
@@ -16,5 +17,5 @@
 			L.status = 0
 			L.on = 1
 			L.update()
-			user.visible_message("[user] repairs \the [target] on the spot with their [src]!","You repair the lightbulb!")
+			user.visible_message("[user] repairs \the [target] on the spot with their [src]!","You repair the lightbulb!","You hear a soft whiiir-pop noise over the sound of flexing glass, followed by the soft hum of an activated [target].")
 		return
@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /obj/item/weapon/stamperaser
 	name = "eraser"
 	desc = "It looks like some kind of eraser."
@@ -15,10 +17,9 @@
 	var/on = 0
 	flags = FPRINT|TABLEPASS
 	w_class = 1
-	var
-		list/obj/item/device/radio/Old = list()
-		list/obj/item/device/radio/Curr = list()
-		time_remaining = 5
+	var/list/obj/item/device/radio/Old = list()
+	var/list/obj/item/device/radio/Curr = list()
+	var/time_remaining = 5

 /obj/item/device/jammer/New()
 	..()
@@ -72,4 +73,4 @@
 		icon_state = "t-ray0"

 	sleep(2)
-	*/
+	*/
@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /obj/item/wardrobe
 	name = "\improper Wardrobe"
 	desc = "A standard-issue bag for clothing and equipment. Usually comes sealed, stocked with everything you need for a particular job."
@@ -6,9 +8,8 @@
 	item_state = "wardrobe"
 	w_class = 4
 	layer = 2.99
-	var
-		descriptor = "various clothing"
-		seal_torn = 0
+	var/descriptor = "various clothing"
+	var/seal_torn = 0

 	attack_self(mob/user)
 		if(!contents.len)
@@ -1,7 +1,7 @@
 /obj/item/weapon/weldpack
 	name = "Welding kit"
 	desc = "A heavy-duty, portable welding fluid carrier."
-	flags = ONBACK
+	slot_flags = SLOT_BACK
 	icon = 'storage.dmi'
 	icon_state = "welderpack"
 	w_class = 4.0
@@ -20,7 +20,7 @@
 			message_admins("[key_name_admin(user)] triggered a fueltank explosion.")
 			log_game("[key_name(user)] triggered a fueltank explosion.")
 			user << "\red That was stupid of you."
-			explosion(src.loc,-1,0,2)
+			explosion(get_turf(src),-1,0,2)
 			if(src)
 				del(src)
 			return
@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 /*

 TODO:
@@ -15,12 +17,11 @@ log transactions
 	anchored = 1
 	use_power = 1
 	idle_power_usage = 10
-	var
-		obj/item/weapon/card/id/card
-		obj/item/weapon/money/cashes = list()
-		inserted = 0
-		accepted = 0
-		pincode = 0
+	var/obj/item/weapon/card/id/card
+	var/obj/item/weapon/money/cashes = list()
+	var/inserted = 0
+	var/accepted = 0
+	var/pincode = 0

 	attackby(var/obj/A, var/mob/user)
 		if(istype(A,/obj/item/weapon/money))
@@ -105,18 +105,17 @@
 				shake_camera(M, 3, 1)
 		if (A)
 			A.meteorhit(src)
-			playsound(src.loc, 'meteorimpact.ogg', 40, 1)
+			playsound(get_turf(src), 'meteorimpact.ogg', 40, 1)
 		if (--src.hits <= 0)
 			if(prob(15))// && !istype(A, /obj/structure/grille))
-				explosion(src.loc, 4, 5, 6, 7, 0)
-				playsound(src.loc, "explosion", 50, 1)
+				explosion(get_turf(src), 4, 5, 6, 7, 0)
+				playsound(get_turf(src), "explosion", 50, 1)
 			del(src)
 	return


 /obj/effect/meteor/ex_act(severity)
-
-	if (severity < 4)
+	spawn(0)
 		del(src)
 	return

@@ -139,11 +138,11 @@
 					A.meteorhit(src)
 				src.hits--
 				return
-				playsound(src.loc, 'meteorimpact.ogg', 40, 1)
+				playsound(get_turf(src), 'meteorimpact.ogg', 40, 1)
 			if (--src.hits <= 0)
 				if(prob(15) && !istype(A, /obj/structure/grille))
-					explosion(src.loc, 1, 2, 3, 4, 0)
-					playsound(src.loc, "explosion", 50, 1)
+					explosion(get_turf(src), 1, 2, 3, 4, 0)
+					playsound(get_turf(src), "explosion", 50, 1)
 				del(src)
 		return

@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:06
+
 // pure concentrated antibodies
 datum/reagent/antibodies
 	data = new/list("antibodies"=0)
@@ -16,20 +18,19 @@ datum/reagent/antibodies
 		return

 // reserving some numbers for later special antigens
-var/global/const
-	ANTIGEN_A  = 1
-	ANTIGEN_B  = 2
-	ANTIGEN_RH = 4
-	ANTIGEN_Q  = 8
-	ANTIGEN_U  = 16
-	ANTIGEN_V  = 32
-	ANTIGEN_X  = 64
-	ANTIGEN_Y  = 128
-	ANTIGEN_Z  = 256
-	ANTIGEN_M  = 512
-	ANTIGEN_N  = 1024
-	ANTIGEN_P  = 2048
-	ANTIGEN_O  = 4096
+var/global/const/ANTIGEN_A  = 1
+var/global/const/ANTIGEN_B  = 2
+var/global/const/ANTIGEN_RH = 4
+var/global/const/ANTIGEN_Q  = 8
+var/global/const/ANTIGEN_U  = 16
+var/global/const/ANTIGEN_V  = 32
+var/global/const/ANTIGEN_X  = 64
+var/global/const/ANTIGEN_Y  = 128
+var/global/const/ANTIGEN_Z  = 256
+var/global/const/ANTIGEN_M  = 512
+var/global/const/ANTIGEN_N  = 1024
+var/global/const/ANTIGEN_P  = 2048
+var/global/const/ANTIGEN_O  = 4096

 var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTIGEN_RH]" = "RH", "[ANTIGEN_Q]" = "Q",
 								      "[ANTIGEN_U]" = "U", "[ANTIGEN_V]" = "V", "[ANTIGEN_Z]" = "Z", "[ANTIGEN_M]" = "M",
@@ -43,8 +44,8 @@ var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTI
 	icon_state = "health"
 	w_class = 2.0
 	item_state = "electronic"
-	flags = FPRINT | TABLEPASS | ONBELT | CONDUCT | USEDELAY
-
+	flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
+	slot_flags = SLOT_BELT

 /obj/item/device/antibody_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob)
 	if(! istype(M, /mob/living/carbon) || !M:antibodies)
@@ -53,4 +54,4 @@ var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTI
 		// iterate over the list of antigens and see what matches
 		var/code = ""
 		for(var/V in ANTIGENS) if(text2num(V) & M.antibodies) code += ANTIGENS[V]
-		user << text("\blue [src] The antibody scanner displays a cryptic set of data: [code]")
+		user << text("\blue [src] The antibody scanner displays a cryptic set of data: [code]")