Fixes not being able to spawn a pai manually.

Fixes not being able to remove your inserted tank from a huge scrubber by removing the ability to insert a tank inside a huge scrubber.
This commit is contained in:
phil235
2015-07-22 15:30:31 +02:00
parent 452313a5fa
commit 24398018c3
2 changed files with 15 additions and 13 deletions
+7 -9
View File
@@ -181,6 +181,7 @@ Power regulator: <A href='?src=\ref[src];volume_adj=-1000'>-</A> <A href='?src=\
var/static/gid = 1
var/id = 0
var/stationary = 0
/obj/machinery/portable_atmospherics/scrubber/huge/New()
..()
@@ -202,6 +203,9 @@ Power regulator: <A href='?src=\ref[src];volume_adj=-1000'>-</A> <A href='?src=\
/obj/machinery/portable_atmospherics/scrubber/huge/attackby(obj/item/weapon/W, mob/user)
if(istype(W, /obj/item/weapon/wrench))
if(stationary)
user << "<span class='warning'>The bolts are too tight for you to unscrew!</span>"
return
if(on)
user << "<span class='warning'>Turn it off first!</span>"
return
@@ -210,16 +214,10 @@ Power regulator: <A href='?src=\ref[src];volume_adj=-1000'>-</A> <A href='?src=\
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
user << "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>"
return
else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
atmosanalyzer_scan(air_contents, user)
..()
/obj/machinery/portable_atmospherics/scrubber/huge/stationary
name = "stationary air scrubber"
/obj/machinery/portable_atmospherics/scrubber/huge/stationary/attackby(obj/item/weapon/W, mob/user)
if(istype(W, /obj/item/weapon/wrench))
user << "<span class='warning'>The bolts are too tight for you to unscrew!</span>"
return
..()
stationary = 0
+8 -4
View File
@@ -48,15 +48,19 @@
var/obj/item/radio/integrated/signal/sradio // AI's signaller
/mob/living/silicon/pai/New(var/obj/item/device/paicard)
/mob/living/silicon/pai/New(var/obj/item/device/paicard/P)
make_laws()
canmove = 0
src.loc = paicard
card = paicard
if(!istype(P)) //when manually spawning a pai, we create a card to put it into.
var/newcardloc = P
P = new /obj/item/device/paicard(newcardloc)
P.setPersonality(src)
loc = P
card = P
sradio = new(src)
if(card)
if(!card.radio)
card.radio = new /obj/item/device/radio(src.card)
card.radio = new /obj/item/device/radio(card)
radio = card.radio
//PDA