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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

Browse Source
This commit is contained in:
Anewbe
2018-08-02 22:35:14 -05:00
parent 729ce71aa0 f69fecf1a1
commit 7f84aeab9f
262 changed files with 7022 additions and 3130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/datacore.dm
View File

@@ -84,10 +84,8 @@
for(var/mob/living/silicon/robot/robot in mob_list)
// No combat/syndicate cyborgs, no drones.
if(robot.module && robot.module.hide_on_manifest)
continue
bot[robot.name] = "[robot.modtype] [robot.braintype]"
if(!robot.scrambledcodes && !(robot.module && robot.module.hide_on_manifest))
bot[robot.name] = "[robot.modtype] [robot.braintype]"
if(heads.len > 0)

4
code/datums/observation/turf_changed.dm
View File

@@ -20,9 +20,9 @@ var/decl/observ/turf_changed/turf_changed_event = new()
* Turf Changed Handling *
************************/
/turf/ChangeTurf()
/turf/ChangeTurf(var/turf/N, var/tell_universe, var/force_lighting_update, var/preserve_outdoors)
var/old_density = density
var/old_opacity = opacity
. = ..()
. = ..(N, tell_universe, force_lighting_update, preserve_outdoors)
if(.)
turf_changed_event.raise_event(src, old_density, density, old_opacity, opacity)