cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Polaris December Sync

Browse Source
This commit is contained in:
killer653
2016-12-10 09:51:11 -05:00
parent 246f7eee6a f256342b09
commit 0c73b9da2e
263 changed files with 5254 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/events/apc_damage.dm
View File

@@ -14,9 +14,10 @@
severity_range = 15
for(var/obj/machinery/power/apc/apc in range(severity_range,A))
if(is_valid_apc(apc))
apc.emagged = 1
apc.update_icon()
if(is_valid_apc(apc)) //This event "****s up" the "id authenticator" on APCs, emagging and unlocking them.
apc.emagged = 1 //It used to just blue screen the APC and make it so it had to be hacked to unlock,
apc.locked = 0 //but most people ignored it. Now it has an actual effect on the round and opens
apc.update_icon() //a small possibility for traitors. To fix, remove power cell and apply multitool.
/datum/event/apc_damage/proc/acquire_random_apc()
var/list/possibleEpicentres = list()

8
code/modules/events/event_dynamic.dm
View File

@@ -196,13 +196,13 @@ var/list/event_last_fired = list()
if(istype(M, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = M
if(R.module)
if(istype(R.module, /obj/item/weapon/robot_module/engineering))
if(istype(R.module, /obj/item/weapon/robot_module/robot/engineering))
active_with_role["Engineer"]++
else if(istype(R.module, /obj/item/weapon/robot_module/security))
else if(istype(R.module, /obj/item/weapon/robot_module/robot/security))
active_with_role["Security"]++
else if(istype(R.module, /obj/item/weapon/robot_module/medical))
else if(istype(R.module, /obj/item/weapon/robot_module/robot/medical))
active_with_role["Medical"]++
else if(istype(R.module, /obj/item/weapon/robot_module/research))
else if(istype(R.module, /obj/item/weapon/robot_module/robot/research))
active_with_role["Scientist"]++
if(M.mind.assigned_role in engineering_positions)