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/game/objects/structures/windoor_assembly.dm
+21 -21
View File
@@ -30,7 +30,7 @@
/obj/structure/windoor_assembly/examine(mob/user)
..()
user << "<span class='notice'>Alt-click to rotate it clockwise.</span>"
to_chat(user, "<span class='notice'>Alt-click to rotate it clockwise.</span>")
/obj/structure/windoor_assembly/New(loc, set_dir)
..()
@@ -98,7 +98,7 @@
if(do_after(user, 40*W.toolspeed, target = src))
if(!src || !WT.isOn()) return
user << "<span class='notice'>You disassemble the windoor assembly.</span>"
to_chat(user, "<span class='notice'>You disassemble the windoor assembly.</span>")
var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5)
RG.add_fingerprint(user)
if(secure)
@@ -112,7 +112,7 @@
if(istype(W, /obj/item/weapon/wrench) && !anchored)
for(var/obj/machinery/door/window/WD in loc)
if(WD.dir == dir)
user << "<span class='warning'>There is already a windoor in that location!</span>"
to_chat(user, "<span class='warning'>There is already a windoor in that location!</span>")
return
playsound(loc, W.usesound, 100, 1)
user.visible_message("[user] secures the windoor assembly to the floor.", "<span class='notice'>You start to secure the windoor assembly to the floor...</span>")
@@ -122,9 +122,9 @@
return
for(var/obj/machinery/door/window/WD in loc)
if(WD.dir == dir)
user << "<span class='warning'>There is already a windoor in that location!</span>"
to_chat(user, "<span class='warning'>There is already a windoor in that location!</span>")
return
user << "<span class='notice'>You secure the windoor assembly.</span>"
to_chat(user, "<span class='notice'>You secure the windoor assembly.</span>")
anchored = 1
if(secure)
name = "secure anchored windoor assembly"
@@ -139,7 +139,7 @@
if(do_after(user, 40*W.toolspeed, target = src))
if(!src || !anchored)
return
user << "<span class='notice'>You unsecure the windoor assembly.</span>"
to_chat(user, "<span class='notice'>You unsecure the windoor assembly.</span>")
anchored = 0
if(secure)
name = "secure windoor assembly"
@@ -150,16 +150,16 @@
else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure)
var/obj/item/stack/sheet/plasteel/P = W
if(P.get_amount() < 2)
user << "<span class='warning'>You need more plasteel to do this!</span>"
to_chat(user, "<span class='warning'>You need more plasteel to do this!</span>")
return
user << "<span class='notice'>You start to reinforce the windoor with plasteel...</span>"
to_chat(user, "<span class='notice'>You start to reinforce the windoor with plasteel...</span>")
if(do_after(user,40, target = src))
if(!src || secure || P.get_amount() < 2)
return
P.use(2)
user << "<span class='notice'>You reinforce the windoor.</span>"
to_chat(user, "<span class='notice'>You reinforce the windoor.</span>")
secure = 1
if(anchored)
name = "secure anchored windoor assembly"
@@ -175,9 +175,9 @@
return
var/obj/item/stack/cable_coil/CC = W
if(!CC.use(1))
user << "<span class='warning'>You need more cable to do this!</span>"
to_chat(user, "<span class='warning'>You need more cable to do this!</span>")
return
user << "<span class='notice'>You wire the windoor.</span>"
to_chat(user, "<span class='notice'>You wire the windoor.</span>")
state = "02"
if(secure)
name = "secure wired windoor assembly"
@@ -197,7 +197,7 @@
if(!src || state != "02")
return
user << "<span class='notice'>You cut the windoor wires.</span>"
to_chat(user, "<span class='notice'>You cut the windoor wires.</span>")
new/obj/item/stack/cable_coil(get_turf(user), 1)
state = "01"
if(secure)
@@ -217,7 +217,7 @@
if(!src || electronics)
W.loc = src.loc
return
user << "<span class='notice'>You install the airlock electronics.</span>"
to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
name = "near finished windoor assembly"
electronics = W
else
@@ -234,7 +234,7 @@
if(do_after(user, 40*W.toolspeed, target = src))
if(!src || !electronics)
return
user << "<span class='notice'>You remove the airlock electronics.</span>"
to_chat(user, "<span class='notice'>You remove the airlock electronics.</span>")
name = "wired windoor assembly"
var/obj/item/weapon/electronics/airlock/ae
ae = electronics
@@ -255,7 +255,7 @@
//Crowbar to complete the assembly, Step 7 complete.
else if(istype(W, /obj/item/weapon/crowbar))
if(!electronics)
usr << "<span class='warning'>The assembly is missing electronics!</span>"
to_chat(usr, "<span class='warning'>The assembly is missing electronics!</span>")
return
usr << browse(null, "window=windoor_access")
playsound(loc, W.usesound, 100, 1)
@@ -266,7 +266,7 @@
if(loc && electronics)
density = 1 //Shouldn't matter but just incase
user << "<span class='notice'>You finish the windoor.</span>"
to_chat(user, "<span class='notice'>You finish the windoor.</span>")
if(secure)
var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(loc)
@@ -326,13 +326,13 @@
if(usr.stat || !usr.canmove || usr.restrained())
return
if(anchored)
usr << "<span class='warning'>[src] cannot be rotated while it is fastened to the floor!</span>"
to_chat(usr, "<span class='warning'>[src] cannot be rotated while it is fastened to the floor!</span>")
return FALSE
var/target_dir = turn(dir, 270)
if(!valid_window_location(loc, target_dir))
usr << "<span class='warning'>[src] cannot be rotated in that direction!</span>"
to_chat(usr, "<span class='warning'>[src] cannot be rotated in that direction!</span>")
return FALSE
setDir(target_dir)
@@ -344,7 +344,7 @@
/obj/structure/windoor_assembly/AltClick(mob/user)
..()
if(user.incapacitated())
user << "<span class='warning'>You can't do that right now!</span>"
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(!in_range(src, user))
return
@@ -360,11 +360,11 @@
return
if(facing == "l")
usr << "<span class='notice'>The windoor will now slide to the right.</span>"
to_chat(usr, "<span class='notice'>The windoor will now slide to the right.</span>")
facing = "r"
else
facing = "l"
usr << "<span class='notice'>The windoor will now slide to the left.</span>"
to_chat(usr, "<span class='notice'>The windoor will now slide to the left.</span>")
update_icon()
return