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/recycling/conveyor2.dm
+15 -14
View File
@@ -125,7 +125,7 @@
var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
C.id = id
transfer_fingerprints_to(C)
user << "<span class='notice'>You remove the conveyor belt.</span>"
to_chat(user, "<span class='notice'>You remove the conveyor belt.</span>")
qdel(src)
else if(istype(I, /obj/item/weapon/wrench))
@@ -133,13 +133,13 @@
playsound(loc, I.usesound, 50, 1)
setDir(turn(dir,-45))
update_move_direction()
user << "<span class='notice'>You rotate [src].</span>"
to_chat(user, "<span class='notice'>You rotate [src].</span>")
else if(istype(I, /obj/item/weapon/screwdriver))
if(!(stat & BROKEN))
verted = verted * -1
update_move_direction()
user << "<span class='notice'>You reverse [src]'s direction.</span>"
to_chat(user, "<span class='notice'>You reverse [src]'s direction.</span>")
else if(user.a_intent != INTENT_HARM)
if(user.drop_item())
@@ -213,17 +213,18 @@
/obj/machinery/conveyor_switch/New(newloc, newid)
..(newloc)
/obj/machinery/conveyor_switch/Initialize(mapload, newid)
if(mapload)
return TRUE //need machines list
..()
if(!id)
id = newid
update()
spawn(5) // allow map load
conveyors = list()
for(var/obj/machinery/conveyor/C in machines)
if(C.id == id)
conveyors += C
conveyors = list()
for(var/obj/machinery/conveyor/C in machines)
if(C.id == id)
conveyors += C
// update the icon depending on the position
@@ -281,7 +282,7 @@
var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
C.id = id
transfer_fingerprints_to(C)
user << "<span class='notice'>You deattach the conveyor switch.</span>"
to_chat(user, "<span class='notice'>You deattach the conveyor switch.</span>")
qdel(src)
/obj/machinery/conveyor_switch/oneway
@@ -303,7 +304,7 @@
/obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/conveyor_switch_construct))
user << "<span class='notice'>You link the switch to the conveyor belt assembly.</span>"
to_chat(user, "<span class='notice'>You link the switch to the conveyor belt assembly.</span>")
var/obj/item/conveyor_switch_construct/C = I
id = C.id
@@ -312,7 +313,7 @@
return
var/cdir = get_dir(A, user)
if(A == user.loc)
user << "<span class='notice'>You cannot place a conveyor belt under yourself.</span>"
to_chat(user, "<span class='notice'>You cannot place a conveyor belt under yourself.</span>")
return
var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A,cdir)
C.id = id
@@ -340,7 +341,7 @@
found = 1
break
if(!found)
user << "\icon[src]<span class=notice>The conveyor switch did not detect any linked conveyor belts in range.</span>"
to_chat(user, "\icon[src]<span class=notice>The conveyor switch did not detect any linked conveyor belts in range.</span>")
return
var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id)
transfer_fingerprints_to(NC)
code/modules/recycling/disposal-construction.dm
+14 -14
View File
@@ -20,7 +20,7 @@
/obj/structure/disposalconstruct/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/disposalconstruct/New(var/loc, var/pipe_type, var/direction = 1)
..(loc)
@@ -102,7 +102,7 @@
return
if(anchored)
usr << "<span class='warning'>You must unfasten the pipe before rotating it!</span>"
to_chat(usr, "<span class='warning'>You must unfasten the pipe before rotating it!</span>")
return
setDir(turn(dir, -90))
@@ -111,7 +111,7 @@
/obj/structure/disposalconstruct/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
@@ -126,7 +126,7 @@
return
if(anchored)
usr << "<span class='warning'>You must unfasten the pipe before flipping it!</span>"
to_chat(usr, "<span class='warning'>You must unfasten the pipe before flipping it!</span>")
return
setDir(turn(dir, 180))
@@ -185,11 +185,11 @@
var/turf/T = loc
if(T.intact && isfloorturf(T))
user << "<span class='warning'>You can only attach the [nicetype] if the floor plating is removed!</span>"
to_chat(user, "<span class='warning'>You can only attach the [nicetype] if the floor plating is removed!</span>")
return
if(!ispipe && iswallturf(T))
user << "<span class='warning'>You can't build [nicetype]s on walls, only disposal pipes!</span>"
to_chat(user, "<span class='warning'>You can't build [nicetype]s on walls, only disposal pipes!</span>")
return
var/obj/structure/disposalpipe/CP = locate() in T
@@ -200,15 +200,15 @@
if(ispipe)
level = 2
density = 0
user << "<span class='notice'>You detach the [nicetype] from the underfloor.</span>"
to_chat(user, "<span class='notice'>You detach the [nicetype] from the underfloor.</span>")
else
if(!is_pipe()) // Disposal or outlet
if(CP) // There's something there
if(!istype(CP,/obj/structure/disposalpipe/trunk))
user << "<span class='warning'>The [nicetype] requires a trunk underneath it in order to work!</span>"
to_chat(user, "<span class='warning'>The [nicetype] requires a trunk underneath it in order to work!</span>")
return
else // Nothing under, fuck.
user << "<span class='warning'>The [nicetype] requires a trunk underneath it in order to work!</span>"
to_chat(user, "<span class='warning'>The [nicetype] requires a trunk underneath it in order to work!</span>")
return
else
if(CP)
@@ -217,13 +217,13 @@
if(istype(CP, /obj/structure/disposalpipe/broken))
pdir = CP.dir
if(pdir & dpdir)
user << "<span class='warning'>There is already a [nicetype] at that location!</span>"
to_chat(user, "<span class='warning'>There is already a [nicetype] at that location!</span>")
return
anchored = 1
if(ispipe)
level = 1 // We don't want disposal bins to disappear under the floors
density = 0
user << "<span class='notice'>You attach the [nicetype] to the underfloor.</span>"
to_chat(user, "<span class='notice'>You attach the [nicetype] to the underfloor.</span>")
playsound(loc, I.usesound, 100, 1)
update_icon()
@@ -232,11 +232,11 @@
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(loc, 'sound/items/Welder2.ogg', 100, 1)
user << "<span class='notice'>You start welding the [nicetype] in place...</span>"
to_chat(user, "<span class='notice'>You start welding the [nicetype] in place...</span>")
if(do_after(user, 8*I.toolspeed, target = src))
if(!loc || !W.isOn())
return
user << "<span class='notice'>The [nicetype] has been welded in place.</span>"
to_chat(user, "<span class='notice'>The [nicetype] has been welded in place.</span>")
update_icon() // TODO: Make this neat
if(ispipe)
@@ -264,7 +264,7 @@
return
else
user << "<span class='warning'>You need to attach it to the plating first!</span>"
to_chat(user, "<span class='warning'>You need to attach it to the plating first!</span>")
return
/obj/structure/disposalconstruct/proc/is_pipe()
code/modules/recycling/disposal-structures.dm
+12 -12
View File
@@ -303,12 +303,12 @@
if(can_be_deconstructed(user))
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "<span class='notice'>You start slicing the disposal pipe...</span>"
to_chat(user, "<span class='notice'>You start slicing the disposal pipe...</span>")
// check if anything changed over 2 seconds
if(do_after(user,30, target = src))
if(!src || !W.isOn()) return
deconstruct()
user << "<span class='notice'>You slice the disposal pipe.</span>"
to_chat(user, "<span class='notice'>You slice the disposal pipe.</span>")
else
return ..()
@@ -423,11 +423,11 @@
/obj/structure/disposalpipe/sortjunction/examine(mob/user)
..()
if(sortTypes.len>0)
user << "It is tagged with the following tags:"
to_chat(user, "It is tagged with the following tags:")
for(var/t in sortTypes)
user << TAGGERLOCATIONS[t]
to_chat(user, TAGGERLOCATIONS[t])
else
user << "It has no sorting tags set."
to_chat(user, "It has no sorting tags set.")
/obj/structure/disposalpipe/sortjunction/proc/updatedir()
@@ -467,10 +467,10 @@
if(O.currTag > 0)// Tag set
if(O.currTag in sortTypes)
sortTypes -= O.currTag
user << "<span class='notice'>Removed \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>"
to_chat(user, "<span class='notice'>Removed \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>")
else
sortTypes |= O.currTag
user << "<span class='notice'>Added \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>"
to_chat(user, "<span class='notice'>Added \"[TAGGERLOCATIONS[O.currTag]]\" filter.</span>")
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
else
return ..()
@@ -583,7 +583,7 @@
/obj/structure/disposalpipe/trunk/can_be_deconstructed(mob/user)
if(linked)
user << "<span class='warning'>You need to deconstruct disposal machinery above this pipe!</span>"
to_chat(user, "<span class='warning'>You need to deconstruct disposal machinery above this pipe!</span>")
else
. = 1
@@ -695,20 +695,20 @@
if(mode==0)
mode=1
playsound(src.loc, I.usesound, 50, 1)
user << "<span class='notice'>You remove the screws around the power connection.</span>"
to_chat(user, "<span class='notice'>You remove the screws around the power connection.</span>")
else if(mode==1)
mode=0
playsound(src.loc, I.usesound, 50, 1)
user << "<span class='notice'>You attach the screws around the power connection.</span>"
to_chat(user, "<span class='notice'>You attach the screws around the power connection.</span>")
else if(istype(I,/obj/item/weapon/weldingtool) && mode==1)
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "<span class='notice'>You start slicing the floorweld off \the [src]...</span>"
to_chat(user, "<span class='notice'>You start slicing the floorweld off \the [src]...</span>")
if(do_after(user,20*I.toolspeed, target = src))
if(!src || !W.isOn()) return
user << "<span class='notice'>You slice the floorweld off \the [src].</span>"
to_chat(user, "<span class='notice'>You slice the floorweld off \the [src].</span>")
stored.loc = loc
src.transfer_fingerprints_to(stored)
stored.update_icon()
code/modules/recycling/disposal-unit.dm
+8 -8
View File
@@ -83,17 +83,17 @@
else
mode = PRESSURE_OFF
playsound(src.loc, I.usesound, 50, 1)
user << "<span class='notice'>You [mode == SCREWS_OUT ? "remove":"attach"] the screws around the power connection.</span>"
to_chat(user, "<span class='notice'>You [mode == SCREWS_OUT ? "remove":"attach"] the screws around the power connection.</span>")
return
else if(istype(I,/obj/item/weapon/weldingtool) && mode == SCREWS_OUT)
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "<span class='notice'>You start slicing the floorweld off \the [src]...</span>"
to_chat(user, "<span class='notice'>You start slicing the floorweld off \the [src]...</span>")
if(do_after(user,20*I.toolspeed, target = src) && mode == SCREWS_OUT)
if(!W.isOn())
return
user << "<span class='notice'>You slice the floorweld off \the [src].</span>"
to_chat(user, "<span class='notice'>You slice the floorweld off \the [src].</span>")
deconstruct()
return
@@ -123,7 +123,7 @@
if(target.buckled || target.has_buckled_mobs())
return
if(target.mob_size > MOB_SIZE_HUMAN)
user << "<span class='warning'>[target] doesn't fit inside [src]!</span>"
to_chat(user, "<span class='warning'>[target] doesn't fit inside [src]!</span>")
return
add_fingerprint(user)
if(user == target)
@@ -173,7 +173,7 @@
// human interact with machine
/obj/machinery/disposal/attack_hand(mob/user)
if(user && user.loc == src)
usr << "<span class='warning'>You cannot reach the controls from inside!</span>"
to_chat(usr, "<span class='warning'>You cannot reach the controls from inside!</span>")
return
interact(user, 0)
@@ -275,7 +275,7 @@
/obj/machinery/disposal/bin/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/storage/bag/trash))
var/obj/item/weapon/storage/bag/trash/T = I
user << "<span class='warning'>You empty the bag.</span>"
to_chat(user, "<span class='warning'>You empty the bag.</span>")
for(var/obj/item/O in T.contents)
T.remove_from_storage(O,src)
T.update_icon()
@@ -290,7 +290,7 @@
if(stat & BROKEN)
return
if(user.loc == src)
user << "<span class='warning'>You cannot reach the controls from inside!</span>"
to_chat(user, "<span class='warning'>You cannot reach the controls from inside!</span>")
return
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
@@ -475,7 +475,7 @@
else if(istype(AM, /mob))
var/mob/M = AM
if(prob(2)) // to prevent mobs being stuck in infinite loops
M << "<span class='warning'>You hit the edge of the chute.</span>"
to_chat(M, "<span class='warning'>You hit the edge of the chute.</span>")
return
M.forceMove(src)
flush()
code/modules/recycling/sortingmachinery.dm
+9 -9
View File
@@ -28,14 +28,14 @@
if(sortTag != O.currTag)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
user << "<span class='notice'>*[tag]*</span>"
to_chat(user, "<span class='notice'>*[tag]*</span>")
sortTag = O.currTag
playsound(loc, 'sound/machines/twobeep.ogg', 100, 1)
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
user << "<span class='warning'>Invalid text!</span>"
to_chat(user, "<span class='warning'>Invalid text!</span>")
return
user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
@@ -47,7 +47,7 @@
giftwrapped = 1
icon_state = "gift[icon_state]"
else
user << "<span class='warning'>You need more paper!</span>"
to_chat(user, "<span class='warning'>You need more paper!</span>")
else
return ..()
@@ -56,17 +56,17 @@
var/atom/movable/AM = loc //can't unwrap the wrapped container if it's inside something.
AM.relay_container_resist(user, O)
return
user << "<span class='notice'>You lean on the back of [O] and start pushing to rip the wrapping around it.</span>"
to_chat(user, "<span class='notice'>You lean on the back of [O] and start pushing to rip the wrapping around it.</span>")
if(do_after(user, 50, target = O))
if(!user || user.stat != CONSCIOUS || user.loc != O || O.loc != src )
return
user << "<span class='notice'>You successfully removed [O]'s wrapping !</span>"
to_chat(user, "<span class='notice'>You successfully removed [O]'s wrapping !</span>")
O.loc = loc
playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
qdel(src)
else
if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.
user << "<span class='warning'>You fail to remove [O]'s wrapping!</span>"
to_chat(user, "<span class='warning'>You fail to remove [O]'s wrapping!</span>")
/obj/item/smallDelivery
@@ -109,14 +109,14 @@
if(sortTag != O.currTag)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
user << "<span class='notice'>*[tag]*</span>"
to_chat(user, "<span class='notice'>*[tag]*</span>")
sortTag = O.currTag
playsound(loc, 'sound/machines/twobeep.ogg', 100, 1)
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
user << "<span class='warning'>Invalid text!</span>"
to_chat(user, "<span class='warning'>Invalid text!</span>")
return
user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
@@ -128,7 +128,7 @@
giftwrapped = 1
user.visible_message("[user] wraps the package in festive paper!")
else
user << "<span class='warning'>You need more paper!</span>"
to_chat(user, "<span class='warning'>You need more paper!</span>")
/obj/item/device/destTagger