cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Interaction/Attack Hand Refactor (#36405)

Browse Source
This commit is contained in:
kevinz000
2018-03-23 11:20:54 +01:00
committed by AnturK
parent 80f6e451fc
commit f300a5c155
347 changed files with 1483 additions and 1186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/npcpool.dm
+1 -1
View File
@@ -31,4 +31,4 @@ SUBSYSTEM_DEF(npcpool)
if(SA.stat != DEAD)
SA.handle_automated_speech()
if (MC_TICK_CHECK)
return
return
code/controllers/subsystem/persistence.dm
+2 -2
View File
@@ -171,7 +171,7 @@ SUBSYSTEM_DEF(persistence)
/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
for(var/A in GLOB.trophy_cases)
var/obj/structure/displaycase/trophy/T = A
if (T.showpiece)
if (T.showpiece)
continue
T.added_roundstart = TRUE
@@ -275,7 +275,7 @@ SUBSYSTEM_DEF(persistence)
/datum/controller/subsystem/persistence/proc/CollectAntagReputation()
var/ANTAG_REP_MAXIMUM = CONFIG_GET(number/antag_rep_maximum)
for(var/p_ckey in antag_rep_change)
// var/start = antag_rep[p_ckey]
antag_rep[p_ckey] = max(0, min(antag_rep[p_ckey]+antag_rep_change[p_ckey], ANTAG_REP_MAXIMUM))