Bleeding edgy refresh (#303)

* 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
+3 -3
View File
@@ -66,7 +66,7 @@
var/crystal_type = /obj/item/weapon/ore/bluespace_crystal/refined
/obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user) // to prevent the construction menu from ever happening
user << "<span class='warning'>You cannot crush the polycrystal in-hand, try breaking one off.</span>"
to_chat(user, "<span class='warning'>You cannot crush the polycrystal in-hand, try breaking one off.</span>")
return
/obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user)
@@ -78,8 +78,8 @@
amount--
if (amount == 0)
qdel(src)
user << "<span class='notice'>You break the final crystal off.</span>"
else user << "<span class='notice'>You break off a crystal.</span>"
to_chat(user, "<span class='notice'>You break the final crystal off.</span>")
else to_chat(user, "<span class='notice'>You break off a crystal.</span>")
else
..()
return
+4 -4
View File
@@ -37,19 +37,19 @@ var/list/GPS_list = list()
if(!user.canUseTopic(src, be_close=TRUE))
return //user not valid to use gps
if(emped)
user << "It's busted!"
to_chat(user, "It's busted!")
if(tracking)
cut_overlay("working")
user << "[src] is no longer tracking, or visible to other GPS devices."
to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.")
tracking = FALSE
else
add_overlay("working")
user << "[src] is now tracking, and visible to other GPS devices."
to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
tracking = TRUE
/obj/item/device/gps/attack_self(mob/user)
if(!tracking)
user << "[src] is turned off. Use alt+click to toggle it back on."
to_chat(user, "[src] is turned off. Use alt+click to toggle it back on.")
return
var/obj/item/device/gps/t = ""
+12 -12
View File
@@ -40,7 +40,7 @@
if(istype(I, /obj/item/device/multitool))
var/obj/item/device/multitool/M = I
M.buffer = src
user << "<span class='caution'>You save the data in the [I.name]'s buffer.</span>"
to_chat(user, "<span class='caution'>You save the data in the [I.name]'s buffer.</span>")
return 1
if(exchange_parts(user, I))
@@ -69,28 +69,28 @@
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
if(anchored)
anchored = 0
user << "<span class='caution'>\The [src] can now be moved.</span>"
to_chat(user, "<span class='caution'>\The [src] can now be moved.</span>")
else if(!anchored)
anchored = 1
user << "<span class='caution'>\The [src] is now secured.</span>"
to_chat(user, "<span class='caution'>\The [src] is now secured.</span>")
else if(istype(W, /obj/item/weapon/screwdriver))
if(stage == 0)
playsound(src, W.usesound, 50, 1)
user << "<span class='caution'>You unscrew the telepad's tracking beacon.</span>"
to_chat(user, "<span class='caution'>You unscrew the telepad's tracking beacon.</span>")
stage = 1
else if(stage == 1)
playsound(src, W.usesound, 50, 1)
user << "<span class='caution'>You screw in the telepad's tracking beacon.</span>"
to_chat(user, "<span class='caution'>You screw in the telepad's tracking beacon.</span>")
stage = 0
else if(istype(W, /obj/item/weapon/weldingtool) && stage == 1)
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
user << "<span class='notice'>You start disassembling [src]...</span>"
to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
if(do_after(user,20*WT.toolspeed, target = src))
if(!WT.isOn())
return
user << "<span class='notice'>You disassemble [src].</span>"
to_chat(user, "<span class='notice'>You disassemble [src].</span>")
new /obj/item/stack/sheet/metal(get_turf(src))
new /obj/item/stack/sheet/glass(get_turf(src))
qdel(src)
@@ -108,7 +108,7 @@
/obj/item/device/telepad_beacon/attack_self(mob/user)
if(user)
user << "<span class='caution'>Locked In</span>"
to_chat(user, "<span class='caution'>Locked In</span>")
new /obj/machinery/telepad_cargo(user.loc)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
qdel(src)
@@ -140,7 +140,7 @@
/obj/item/weapon/rcs/examine(mob/user)
..()
user << "There are [rcharges] charge\s left."
to_chat(user, "There are [rcharges] charge\s left.")
/obj/item/weapon/rcs/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -159,11 +159,11 @@
if(mode == 0)
mode = 1
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
user << "<span class='caution'>The telepad locator has become uncalibrated.</span>"
to_chat(user, "<span class='caution'>The telepad locator has become uncalibrated.</span>")
else
mode = 0
playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
user << "<span class='caution'>You calibrate the telepad locator.</span>"
to_chat(user, "<span class='caution'>You calibrate the telepad locator.</span>")
/obj/item/weapon/rcs/emag_act(mob/user)
if(!emagged)
@@ -171,4 +171,4 @@
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
user << "<span class='caution'>You emag the RCS. Click on it to toggle between modes.</span>"
to_chat(user, "<span class='caution'>You emag the RCS. Click on it to toggle between modes.</span>")
+4 -4
View File
@@ -43,7 +43,7 @@
/obj/machinery/computer/telescience/examine(mob/user)
..()
user << "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots."
to_chat(user, "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots.")
/obj/machinery/computer/telescience/Initialize(mapload)
..()
@@ -52,13 +52,13 @@
crystals += new /obj/item/weapon/ore/bluespace_crystal/artificial(null) // starting crystals
/obj/machinery/computer/telescience/attack_paw(mob/user)
user << "<span class='warning'>You are too primitive to use this computer!</span>"
to_chat(user, "<span class='warning'>You are too primitive to use this computer!</span>")
return
/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/ore/bluespace_crystal))
if(crystals.len >= max_crystals)
user << "<span class='warning'>There are not enough crystal slots.</span>"
to_chat(user, "<span class='warning'>There are not enough crystal slots.</span>")
return
if(!user.drop_item())
return
@@ -77,7 +77,7 @@
if(M.buffer && istype(M.buffer, /obj/machinery/telepad))
telepad = M.buffer
M.buffer = null
user << "<span class='caution'>You upload the data from the [W.name]'s buffer.</span>"
to_chat(user, "<span class='caution'>You upload the data from the [W.name]'s buffer.</span>")
else
return ..()