shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bleeding edgy refresh (#303)

Browse Source 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+12 -12
View File
@@ -138,15 +138,15 @@ By design, d1 is the smallest direction and d2 is the highest
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = W
if (coil.get_amount() < 1)
user << "<span class='warning'>Not enough cable!</span>"
to_chat(user, "<span class='warning'>Not enough cable!</span>")
return
coil.cable_join(src, user)
else if(istype(W, /obj/item/device/multitool))
if(powernet && (powernet.avail > 0)) // is it powered?
user << "<span class='danger'>[powernet.avail]W in power network.</span>"
to_chat(user, "<span class='danger'>[powernet.avail]W in power network.</span>")
else
user << "<span class='danger'>The cable is not powered.</span>"
to_chat(user, "<span class='danger'>The cable is not powered.</span>")
shock(user, 5, 0.2)
src.add_fingerprint(user)
@@ -555,15 +555,15 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
return
if(!T.can_have_cabling())
user << "<span class='warning'>You can only lay cables on catwalks and plating!</span>"
to_chat(user, "<span class='warning'>You can only lay cables on catwalks and plating!</span>")
return
if(get_amount() < 1) // Out of cable
user << "<span class='warning'>There is no cable left!</span>"
to_chat(user, "<span class='warning'>There is no cable left!</span>")
return
if(get_dist(T,user) > 1) // Too far
user << "<span class='warning'>You can't lay cable at a place that far away!</span>"
to_chat(user, "<span class='warning'>You can't lay cable at a place that far away!</span>")
return
else
@@ -576,7 +576,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
for(var/obj/structure/cable/LC in T)
if(LC.d2 == dirn && LC.d1 == 0)
user << "<span class='warning'>There's already a cable at that position!</span>"
to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
return
var/obj/structure/cable/C = get_new_cable(T)
@@ -617,7 +617,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
return
if(get_dist(C, user) > 1) // make sure it's close enough
user << "<span class='warning'>You can't lay cable at a place that far away!</span>"
to_chat(user, "<span class='warning'>You can't lay cable at a place that far away!</span>")
return
@@ -630,10 +630,10 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
// one end of the clicked cable is pointing towards us
if(C.d1 == dirn || C.d2 == dirn)
if(!U.can_have_cabling()) //checking if it's a plating or catwalk
user << "<span class='warning'>You can only lay cables on catwalks and plating!</span>"
to_chat(user, "<span class='warning'>You can only lay cables on catwalks and plating!</span>")
return
if(U.intact) //can't place a cable if it's a plating with a tile on it
user << "<span class='warning'>You can't lay cable there unless the floor tiles are removed!</span>"
to_chat(user, "<span class='warning'>You can't lay cable there unless the floor tiles are removed!</span>")
return
else
// cable is pointing at us, we're standing on an open tile
@@ -643,7 +643,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already
if(LC.d1 == fdirn || LC.d2 == fdirn)
user << "<span class='warning'>There's already a cable at that position!</span>"
to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
return
var/obj/structure/cable/NC = get_new_cable (U)
@@ -687,7 +687,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
if(LC == C) // skip the cable we're interacting with
continue
if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction
user << "<span class='warning'>There's already a cable at that position!</span>"
to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
return