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

Update SpacemanDMM suite to 1.2 (#48785)

Browse Source 
* Update SpacemanDMM suite to 1.2

* Fix new lint errors
This commit is contained in:
spookydonut
2020-01-16 11:49:39 -05:00
committed by Jordan Brown
parent bca492823a
commit 3195ceaa22
31 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/economy.dm
+1 -1
View File
@@ -113,7 +113,7 @@ SUBSYSTEM_DEF(economy)
D.adjust_money(medical_cash)
if(ishostile(m))
var/mob/living/simple_animal/hostile/H = m
if(H.stat == DEAD && H.z in SSmapping.levels_by_trait(ZTRAIT_STATION))
if(H.stat == DEAD && (H.z in SSmapping.levels_by_trait(ZTRAIT_STATION)))
dead_monsters++
CHECK_TICK
var/living_ratio = alive_crew / crew
code/controllers/subsystem/job.dm
+3 -3
View File
@@ -115,7 +115,7 @@ SUBSYSTEM_DEF(job)
if(flag && (!(flag in player.client.prefs.be_special)))
JobDebug("FOC flag failed, Player: [player], Flag: [flag], ")
continue
if(player.mind && job.title in player.mind.restricted_roles)
if(player.mind && (job.title in player.mind.restricted_roles))
JobDebug("FOC incompatible with antagonist role, Player: [player]")
continue
if(player.client.prefs.job_preferences[job.title] == level)
@@ -151,7 +151,7 @@ SUBSYSTEM_DEF(job)
JobDebug("GRJ player not enough xp, Player: [player]")
continue
if(player.mind && job.title in player.mind.restricted_roles)
if(player.mind && (job.title in player.mind.restricted_roles))
JobDebug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
continue
@@ -331,7 +331,7 @@ SUBSYSTEM_DEF(job)
JobDebug("DO player not enough xp, Player: [player], Job:[job.title]")
continue
if(player.mind && job.title in player.mind.restricted_roles)
if(player.mind && (job.title in player.mind.restricted_roles))
JobDebug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
continue