Merge pull request #8704 from Zuhayr/dev

Fixes
This commit is contained in:
Chinsky
2015-04-02 23:49:54 +03:00
21 changed files with 86 additions and 56 deletions
+4 -1
View File
@@ -28,7 +28,9 @@
// This could use work.
if(flags & ANTAG_CLEAR_EQUIPMENT)
for(var/obj/item/thing in player.contents)
del(thing)
player.drop_from_inventory(thing)
if(thing.loc != player)
del(thing)
return 1
if(flags & ANTAG_SET_APPEARANCE)
@@ -80,6 +82,7 @@
/datum/antagonist/proc/create_id(var/assignment, var/mob/living/carbon/human/player)
var/obj/item/weapon/card/id/W = new id_type(player)
if(!W) return
W.name = "[player.real_name]'s ID Card"
W.access |= default_access
W.assignment = "[assignment]"
+3 -2
View File
@@ -44,8 +44,9 @@ var/datum/antagonist/deathsquad/deathsquad
player.implant_loyalty(player)
var/obj/item/weapon/card/id/id = create_id("Asset Protection", player)
id.access |= get_all_accesses()
id.icon_state = "centcom"
if(id)
id.access |= get_all_accesses()
id.icon_state = "centcom"
create_radio(DTH_FREQ, player)
/datum/antagonist/deathsquad/apply(var/datum/mind/player)
+1 -1
View File
@@ -165,7 +165,7 @@
if((0 < beard) && (beard <= facial_hair_styles_list.len))
H.f_style = facial_hair_styles_list[beard]
H.update_body(0)
H.force_update_limbs()
H.update_hair()
return 1
+1 -1
View File
@@ -98,8 +98,8 @@ var/global/datum/controller/gameticker/ticker
src.mode = config.pick_mode(master_mode)
if(!mode_started && !src.mode.can_start())
world << "<B>Unable to start [mode.name].</B> Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby."
del(mode)
current_state = GAME_STATE_PREGAME
mode = null
job_master.ResetOccupations()
return 0