Merge pull request #460 from Markolie/master

Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
This commit is contained in:
ZomgPonies
2015-03-01 12:30:15 -05:00
70 changed files with 2942 additions and 2022 deletions
@@ -65,6 +65,9 @@
return (tally + move_delay_add + config.alien_delay)
/mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0)
if(..())
return 1
return 0
///mob/living/carbon/alien/humanoid/bullet_act(var/obj/item/projectile/Proj) taken care of in living
+2 -2
View File
@@ -476,10 +476,10 @@
update_inv_wear_mask(0)
else if(I == handcuffed)
handcuffed = null
update_inv_handcuffed(0)
update_inv_handcuffed(1)
else if(I == legcuffed)
legcuffed = null
update_inv_legcuffed(0)
update_inv_legcuffed(1)
/mob/living/carbon/show_inv(mob/living/carbon/user as mob)
user.set_machine(src)
@@ -182,7 +182,7 @@
update_inv_back(0)
else if(I == handcuffed)
handcuffed = null
update_inv_handcuffed(0)
update_inv_handcuffed(1)
else if(I == legcuffed)
legcuffed = null
update_inv_legcuffed(0)
@@ -97,6 +97,12 @@
if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone"))
usr << "\red You are banned from playing drones and cannot spawn as a drone."
return
var/drone_age = 14 // 14 days to play as a drone
var/player_age_check = check_client_age(usr.client, drone_age)
if(player_age_check && config.use_age_restriction_for_antags)
usr << "<span class='warning'>This role is not yet available to you. You need to wait another [player_age_check] days.</span>"
return
var/deathtime = world.time - src.timeofdeath
var/joinedasobserver = 0
@@ -1484,16 +1484,6 @@ var/list/robot_verbs_default = list(
radio.recalculateChannels()
playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0)
/mob/living/silicon/robot/syndicate/canUseTopic(atom/movable/M)
if(stat || lockcharge || stunned || weakened)
return
if(z in config.admin_levels)
return 1
/*if(istype(M, /obj/machinery))
var/obj/machinery/Machine = M
return Machine.emagged*/
return 1
/mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/oldname, var/newname)
if(!connected_ai)
+12
View File
@@ -114,6 +114,11 @@ proc/isembryo(A)
if(istype(A, /mob/living/silicon))
return 1
return 0
/proc/isSilicon(A) // Bay support
if(istype(A, /mob/living/silicon))
return 1
return 0
/proc/isliving(A)
if(istype(A, /mob/living))
@@ -158,6 +163,13 @@ proc/isnewplayer(A)
proc/hasorgans(A)
return ishuman(A)
proc/iscuffed(A)
if(istype(A, /mob/living/carbon))
var/mob/living/carbon/C = A
if(C.handcuffed)
return 1
return 0
proc/isdeaf(A)
if(istype(A, /mob))