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

TG: Emitters emp_act now uses severity properly.

Browse Source 
The PA can no longer be remotely controlled by humans and cyborgs can only
control it if they are nearby.
The spawn PA can now be taken apart.
FireAx/Extinguisher closets got their own files.
Food closets are now with their defines.
Freezer closet/crates override return_air() to cooldown the contents.
The var isinfreezer has been eliminated.
The old player panel has been readded as an alt for the new one, it may be found
under the Player Panel verb.
The new player panel may be accessed by the Player Panel-New verb.
Crates.dm moved from the storage folder as it is not a storage object.
Fixed  Issue 227  about the PA shooting when it should not be. r2851
This commit is contained in:
Ren Erthilo
2012-03-26 18:45:48 +01:00
parent ab9f1cc121
commit f7e8bcd591
10 changed files with 151 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -34,12 +34,21 @@
connected_parts = list()
return
if(!part_scan())
assembled = 0
use_power = 1
active = 0
connected_parts = list()
return
Topic(href, href_list)
..()
//Ignore input if we are broken, !silicon guy cant touch us, or nonai controlling from super far away
if(stat & (BROKEN|NOPOWER) || (get_dist(src, usr) > 1 && !istype(usr, /mob/living/silicon)) || (get_dist(src, usr) > 8 && !istype(usr, /mob/living/silicon/ai)))
usr.machine = null
usr << browse(null, "window=pacontrol")
return
if( href_list["close"] )
usr << browse(null, "window=pacontrol")
usr.machine = null
@@ -63,6 +72,7 @@
message_admins("[usr] decreased particle accelerator power to [strength].")
log_admin("[usr] decreased particle accelerator power to [strength].")
src.updateDialog()
return
power_change()
@@ -74,6 +84,7 @@
use_power = 1
return
process()
if(src.active)
for(var/obj/structure/particle_accelerator/particle_emitter/PE in connected_parts)
@@ -145,8 +156,8 @@
interact(mob/user)
if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if (!istype(user, /mob/living/silicon))
if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
if(!istype(user, /mob/living/silicon))
user.machine = null
user << browse(null, "window=pacontrol")
return
@@ -172,3 +183,4 @@
user << browse(dat, "window=pacontrol;size=420x500")
onclose(user, "pacontrol")
return