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

Space drugs should no longer cause people to act weird inside lockers and such.

Browse Source 
Tele now ignores beacons and trackers on Z2
Singularity grav range reduced a bit due to lag


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2047 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-08-25 08:53:01 +00:00
parent a4c24f073c
commit 1d20768b4c
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/machinery/teleporter.dm
View File

@@ -46,8 +46,9 @@
var/list/areaindex = list() var/list/areaindex = list()
for(var/obj/item/device/radio/beacon/R in world) for(var/obj/item/device/radio/beacon/R in world)
var/turf/T = find_loc(R) var/turf/T = get_turf(R)
if (!T) continue if (!T) continue
if(T.z == 2) continue
var/tmpname = T.loc.name var/tmpname = T.loc.name
if(areaindex[tmpname]) if(areaindex[tmpname])
tmpname = "[tmpname] ([++areaindex[tmpname]])" tmpname = "[tmpname] ([++areaindex[tmpname]])"
@@ -63,6 +64,9 @@
if (M.stat == 2) if (M.stat == 2)
if (M.timeofdeath + 6000 < world.time) if (M.timeofdeath + 6000 < world.time)
continue continue
var/turf/T = get_turf(M)
if(T) continue
if(T.z == 2) continue
var/tmpname = M.real_name var/tmpname = M.real_name
if(areaindex[tmpname]) if(areaindex[tmpname])
tmpname = "[tmpname] ([++areaindex[tmpname]])" tmpname = "[tmpname] ([++areaindex[tmpname]])"

4
code/modules/chemical/Chemistry-Reagents.dm
View File

@@ -414,7 +414,9 @@ datum
on_mob_life(var/mob/living/M as mob) on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom if(!M) M = holder.my_atom
M.druggy = max(M.druggy, 15) M.druggy = max(M.druggy, 15)
if(M.canmove) step(M, pick(cardinal)) if(isturf(M.loc))
if(M.canmove)
step(M, pick(cardinal))
if(prob(7)) M:emote(pick("twitch","drool","moan","giggle")) if(prob(7)) M:emote(pick("twitch","drool","moan","giggle"))
holder.remove_reagent(src.id, 0.2) holder.remove_reagent(src.id, 0.2)
return return

9
code/modules/power/singularity/singularity.dm
View File

@@ -168,7 +168,7 @@ var/global/list/uneatable = list(
icon_state = "singularity_s9" icon_state = "singularity_s9"
pixel_x = -128 pixel_x = -128
pixel_y = -128 pixel_y = -128
grav_pull = 15//This might cause some lag, dono though grav_pull = 10
consume_range = 4 consume_range = 4
dissipate = 0 //It cant go smaller due to e loss dissipate = 0 //It cant go smaller due to e loss
if(current_size == allowed_size) if(current_size == allowed_size)
@@ -200,6 +200,7 @@ var/global/list/uneatable = list(
eat() eat()
set background = 1
for(var/atom/movable/X in orange(consume_range,src)) for(var/atom/movable/X in orange(consume_range,src))
consume(X) consume(X)
for(var/turf/X in orange(consume_range,src)) for(var/turf/X in orange(consume_range,src))
@@ -362,9 +363,7 @@ var/global/list/uneatable = list(
toxmob() toxmob()
var/toxrange = 8 var/toxrange = 10
if (src.energy>1000)
toxrange += 6
var/toxloss = 4 var/toxloss = 4
var/radiation = 5 var/radiation = 5
if (src.energy>200) if (src.energy>200)
@@ -426,7 +425,7 @@ var/global/list/uneatable = list(
emp_area() emp_area()
empulse(src, 6, 8) empulse(src, 8, 10)
return return