mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
Singularity now wont leave floor under eaten walls.
Cryo wont spit out beaker. Fixed message "You don't have the dexterity to do this" for machinery. PIPES: - Heat exchange pipes are constructable now. - Insulated pipes also were added to pipe dispenser; - And meters too; - Easy pipe rotating in hands; - bent pipes actually looks bent under construction (may be glitches, please report); - pipes now wont cover wires; - pipes unwrenching now possible; - large vent pumps now uses power as equipment, not environment - pumps now uses power; Air alarm improvements: - all alarms in area controls all environment machines in area; - machines initializes itself automatically and without interloping with existing ones; - air alarms wont duplicates it air monitoring and can clear itself; Some other typos and small issues were fixed. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@816 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -158,12 +158,11 @@ move an amendment</a> to the drawing.</p>
|
||||
|
||||
|
||||
/obj/item/blueprints/proc/set_area_machinery_title(var/area/A,var/title,var/oldtitle)
|
||||
for(var/area/RA in A.related)
|
||||
for(var/obj/machinery/alarm/M in RA)
|
||||
M.alarm_zone = title
|
||||
if (!oldtitle) // or dd_replacetext goes to infinite loop
|
||||
return
|
||||
for(var/area/RA in A.related)
|
||||
for(var/obj/machinery/alarm/M in RA)
|
||||
M.name = dd_replacetext(M.name,oldtitle,title)
|
||||
for(var/obj/machinery/power/apc/M in RA)
|
||||
M.name = dd_replacetext(M.name,oldtitle,title)
|
||||
for(var/obj/machinery/atmospherics/unary/vent_scrubber/M in RA)
|
||||
|
||||
@@ -71,11 +71,11 @@
|
||||
else
|
||||
to_transfer = min(src.amount, S.max_amount-S.amount)
|
||||
S.amount+=to_transfer
|
||||
if (S && usr.machine==S)
|
||||
spawn(0) S.interact(usr)
|
||||
src.use(to_transfer)
|
||||
if (src && usr.machine==src)
|
||||
spawn(0) src.interact(usr)
|
||||
if (S && usr.machine==S)
|
||||
spawn(0) S.interact(usr)
|
||||
else return ..()
|
||||
|
||||
/obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
if (istype(src.loc, /obj/item/assembly))
|
||||
icon = src.loc
|
||||
if (!in_range(src, usr))
|
||||
if (icon == src) usr << "\blue It's a \icon[icon][src]! If you want any more information you'll need to get closer."
|
||||
if (icon == src) usr << "\blue It's \a \icon[icon][src]! If you want any more information you'll need to get closer."
|
||||
return
|
||||
|
||||
var/celsius_temperature = src.air_contents.temperature-T0C
|
||||
@@ -244,7 +244,7 @@
|
||||
else
|
||||
descriptive = "furiously hot"
|
||||
|
||||
usr << text("\blue The \icon[][src] feels []", icon, descriptive)
|
||||
usr << text("\blue \The \icon[][src] feels []", icon, descriptive)
|
||||
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user