cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7827 from FalseIncarnate/plumbing

Browse Source 
Plumbing Update
This commit is contained in:
tigercat2000
2017-09-12 20:20:23 -07:00
committed by GitHub
parent 529edc5700 a60a4935ac
commit 484af3afc4
9 changed files with 420 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/mountable_frames/apc_frame.dm
+2 -2
View File
@@ -10,11 +10,11 @@
var/turf/turf_loc = get_turf(user)
var/area/area_loc = turf_loc.loc
if(area_loc.get_apc())
to_chat(user, "<span class='rose'>This area already has an APC.</span>")
to_chat(user, "<span class='warning'>This area already has an APC.</span>")
return //only one APC per area
for(var/obj/machinery/power/terminal/T in turf_loc)
if(T.master)
to_chat(user, "<span class='rose'>There is another network terminal here.</span>")
to_chat(user, "<span class='warning'>There is another network terminal here.</span>")
return
else
var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(turf_loc)
code/game/objects/items/mountable_frames/frames.dm
+2 -2
View File
@@ -20,11 +20,11 @@
var/turf/turf_loc = get_turf(user)
if(src.mount_reqs.Find("simfloor") && !istype(turf_loc, /turf/simulated/floor))
to_chat(user, "<span class='rose'>[src] cannot be placed on this spot.</span>")
to_chat(user, "<span class='warning'>[src] cannot be placed on this spot.</span>")
return
if(src.mount_reqs.Find("nospace"))
var/area/my_area = turf_loc.loc
if(!istype(my_area) || (my_area.requires_power == 0 || istype(my_area,/area/space)))
to_chat(user, "<span class='rose'>[src] cannot be placed in this area.</span>")
to_chat(user, "<span class='warning'>[src] cannot be placed in this area.</span>")
return
return 1
code/game/objects/items/mountable_frames/mountables.dm
+2 -2
View File
@@ -21,11 +21,11 @@
if(proximity_flag != 1) //if we aren't next to the wall
return
if(!( get_dir(on_wall,user) in cardinal))
to_chat(user, "<span class='rose'>You need to be standing next to a wall to place \the [src].</span>")
to_chat(user, "<span class='warning'>You need to be standing next to a wall to place \the [src].</span>")
return
if(gotwallitem(get_turf(user), get_dir(on_wall,user)))
to_chat(user, "<span class='rose'>There's already an item on this wall!</span>")
to_chat(user, "<span class='warning'>There's already an item on this wall!</span>")
return
return 1