Bug fixes

This commit is contained in:
Markolie
2015-02-05 12:55:18 +01:00
parent afac549c39
commit 95679c01bb
6 changed files with 26 additions and 33 deletions
+2 -2
View File
@@ -501,7 +501,7 @@
icon_state = "rig0-singuloth"
item_state = "singuloth_helm"
_color = "singuloth"
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 80)
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 100)
/obj/item/clothing/suit/space/rig/singuloth
icon_state = "rig-singuloth"
@@ -509,4 +509,4 @@
desc = "This is a ceremonial armor from the chapter of the Singuloth Knights. It's made of pure forged adamantium."
item_state = "singuloth_hardsuit"
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 80)
armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 100)
+13 -25
View File
@@ -101,85 +101,73 @@
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/psyche
name = "psychedelic"
name = "psychedelic jumpsuit"
desc = "Groovy!"
icon_state = "psyche"
_color = "psyche"
/obj/item/clothing/under/color/lightblue
name = "lightblue"
desc = "lightblue"
name = "light blue jumpsuit"
icon_state = "lightblue"
_color = "lightblue"
/obj/item/clothing/under/color/aqua
name = "aqua"
desc = "aqua"
name = "aqua jumpsuit"
icon_state = "aqua"
_color = "aqua"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/purple
name = "purple"
desc = "purple"
name = "purple jumpsuit"
icon_state = "purple"
item_state = "p_suit"
_color = "purple"
/obj/item/clothing/under/color/lightpurple
name = "lightpurple"
desc = "lightpurple"
name = "light purple jumpsuit"
icon_state = "lightpurple"
_color = "lightpurple"
/obj/item/clothing/under/color/lightgreen
name = "lightgreen"
desc = "lightgreen"
name = "light green jumpsuit"
icon_state = "lightgreen"
_color = "lightgreen"
/obj/item/clothing/under/color/lightblue
name = "lightblue"
desc = "lightblue"
name = "light blue jumpsuit"
icon_state = "lightblue"
_color = "lightblue"
/obj/item/clothing/under/color/lightbrown
name = "lightbrown"
desc = "lightbrown"
name = "light brown jumpsuit"
icon_state = "lightbrown"
_color = "lightbrown"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/brown
name = "brown"
desc = "brown"
name = "brown jumpsuit"
icon_state = "brown"
_color = "brown"
flags = FPRINT | TABLEPASS
/obj/item/clothing/under/color/yellowgreen
name = "yellowgreen"
desc = "yellowgreen"
name = "yellow green jumpsuit"
icon_state = "yellowgreen"
_color = "yellowgreen"
/obj/item/clothing/under/color/darkblue
name = "darkblue"
desc = "darkblue"
name = "dark blue jumpsuit"
icon_state = "darkblue"
_color = "darkblue"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
/obj/item/clothing/under/color/lightred
name = "lightred"
desc = "lightred"
name = "light red jumpsuit"
icon_state = "lightred"
_color = "lightred"
/obj/item/clothing/under/color/darkred
name = "darkred"
desc = "darkred"
name = "dark red jumpsuit"
icon_state = "darkred"
_color = "darkred"
flags = FPRINT | TABLEPASS | ONESIZEFITSALL
@@ -349,12 +349,15 @@ var/datum/paiController/paiController // Global handler for pAI candidates
proc/requestRecruits()
for(var/mob/dead/observer/O in player_list)
if(O.client && O.client.prefs.be_special & BE_PAI)
if(check_recruit(O))
O << "\blue <b>A pAI card is looking for personalities. (<a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</b>"
//question(O.client)
if(player_old_enough_antag(O.client,BE_PAI))
if(check_recruit(O))
O << "\blue <b>A pAI card is looking for personalities. (<a href='?src=\ref[src];signup=\ref[O]'>Sign Up</a>)</b>"
//question(O.client)
proc/check_recruit(var/mob/dead/observer/O)
if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept"))
return 0
if(!player_old_enough_antag(O.client,BE_PAI))
return 0
if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
return 0
if(O.client)