Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
This commit is contained in:
Erthilo
2012-05-31 15:09:35 +01:00
189 changed files with 2489 additions and 1543 deletions

View File

@@ -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",
@@ -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]")