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

Requested Changes

Browse Source
This commit is contained in:
Unknown
2020-04-26 10:58:56 -04:00
parent da35289e9e
commit dfedf60c0f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/__defines/__513_compatibility.dm
View File

@@ -1,6 +1,6 @@
#if DM_VERSION < 513 #if DM_VERSION < 513
#define ismovableatom(A) (istype(A, /atom/movable)) #define ismovable(A) (istype(A, /atom/movable))
#define islist(L) (istype(L, /list)) #define islist(L) (istype(L, /list))
@@ -18,8 +18,6 @@
#else #else
#define ismovableatom(A) ismovable(A)
#define CLAMP01(x) clamp(x, 0, 1) #define CLAMP01(x) clamp(x, 0, 1)
#define CLAMP(CLVALUE, CLMIN, CLMAX) clamp(CLVALUE, CLMIN, CLMAX) #define CLAMP(CLVALUE, CLMIN, CLMAX) clamp(CLVALUE, CLMIN, CLMAX)

3
code/modules/overmap/ships/computers/computer_shims.dm
View File

@@ -96,5 +96,8 @@
/obj/machinery/computer/ship/attack_hand(mob/user) /obj/machinery/computer/ship/attack_hand(mob/user)
if((. = ..())) if((. = ..()))
return return
if(!allowed(user))
to_chat(user, "<span class='warning'>Access Denied.</span>")
return 1
if(CanUseTopic(user, DefaultTopicState()) > STATUS_CLOSE) if(CanUseTopic(user, DefaultTopicState()) > STATUS_CLOSE)
return interface_interact(user) return interface_interact(user)

2
code/modules/vore/resizing/grav_pull_vr.dm
View File

@@ -31,7 +31,7 @@
// Let's just make this one loop. // Let's just make this one loop.
for(var/X in orange(pull_radius, location)) for(var/X in orange(pull_radius, location))
// Movable atoms only // Movable atoms only
if(!ismovableatom(X) || istype(X, /obj/effect/overlay)) if(!ismovable(X) || istype(X, /obj/effect/overlay))
continue continue
if(ishuman(X)) if(ishuman(X))