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/atmospherics/machinery/components/binary_devices/circulator.dm
+1 -1
View File
@@ -40,7 +40,7 @@
last_pressure_delta = pressure_delta
//world << "pressure_delta = [pressure_delta]; transfer_moles = [transfer_moles];"
//to_chat(world, "pressure_delta = [pressure_delta]; transfer_moles = [transfer_moles];")
//Actually transfer the gas
var/datum/gas_mixture/removed = air2.remove(transfer_moles)
code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+1 -1
View File
@@ -169,7 +169,7 @@ Passive gate is similar to the regular pump except:
/obj/machinery/atmospherics/components/binary/passive_gate/can_unwrench(mob/user)
if(..())
if(on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
to_chat(user, "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>")
else
return 1
code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+1 -1
View File
@@ -184,7 +184,7 @@ Thus, the two variables affect pump operation are set in New():
var/turf/T = get_turf(src)
var/area/A = get_area(src)
if(!(stat & NOPOWER) && on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
to_chat(user, "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>")
else
investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
message_admins("Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)]")
code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+1 -1
View File
@@ -181,7 +181,7 @@ Thus, the two variables affect pump operation are set in New():
var/turf/T = get_turf(src)
//var/area/A = get_area(src)
if(!(stat & NOPOWER) && on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
to_chat(user, "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>")
else
investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
code/modules/atmospherics/machinery/components/components_base.dm
+1 -1
View File
@@ -167,6 +167,6 @@ UI Stuff
/obj/machinery/atmospherics/components/ui_status(mob/user)
if(allowed(user))
return ..()
user << "<span class='danger'>Access denied.</span>"
to_chat(user, "<span class='danger'>Access denied.</span>")
return UI_CLOSE
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+5 -5
View File
@@ -232,7 +232,7 @@
return occupant
/obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/living/user)
user << "<span class='notice'>You struggle inside the cryotube, kicking the release with your foot... (This will take around 30 seconds.)</span>"
to_chat(user, "<span class='notice'>You struggle inside the cryotube, kicking the release with your foot... (This will take around 30 seconds.)</span>")
audible_message("<span class='notice'>You hear a thump from [src].</span>")
if(do_after(user, 300))
if(occupant == user) // Check they're still here.
@@ -242,11 +242,11 @@
..()
if(occupant)
if(on)
user << "Someone's inside [src]!"
to_chat(user, "[occupant] is inside [src]!")
else
user << "You can barely make out a form floating in [src]."
to_chat(user, "You can barely make out a form floating in [src].")
else
user << "[src] seems empty."
to_chat(user, "[src] seems empty.")
/obj/machinery/atmospherics/components/unary/cryo_cell/MouseDrop_T(mob/target, mob/user)
if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser())
@@ -257,7 +257,7 @@
if(istype(I, /obj/item/weapon/reagent_containers/glass))
. = 1 //no afterattack
if(beaker)
user << "<span class='warning'>A beaker is already loaded into [src]!</span>"
to_chat(user, "<span class='warning'>A beaker is already loaded into [src]!</span>")
return
if(!user.drop_item())
return
code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
+1 -1
View File
@@ -30,7 +30,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/can_unwrench(mob/user)
if(..())
if(connected_device)
user << "<span class='warning'>You cannot unwrench this [src], detach [connected_device] first!</span>"
to_chat(user, "<span class='warning'>You cannot unwrench this [src], detach [connected_device] first!</span>")
else
return 1
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+1 -1
View File
@@ -57,7 +57,7 @@
newtype = heater
name = initial(newtype.name)
build_path = initial(newtype.build_path)
user << "<span class='notice'>You change the circuitboard setting to \"[new_setting]\".</span>"
to_chat(user, "<span class='notice'>You change the circuitboard setting to \"[new_setting]\".</span>")
else
return ..()
code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+3 -3
View File
@@ -248,7 +248,7 @@
var/obj/item/weapon/weldingtool/WT = W
if (WT.remove_fuel(0,user))
playsound(loc, WT.usesound, 40, 1)
user << "<span class='notice'>You begin welding the vent...</span>"
to_chat(user, "<span class='notice'>You begin welding the vent...</span>")
if(do_after(user, 20*W.toolspeed, target = src))
if(!src || !WT.isOn()) return
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -268,14 +268,14 @@
/obj/machinery/atmospherics/components/unary/vent_pump/can_unwrench(mob/user)
if(..())
if(!(stat & NOPOWER) && on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
to_chat(user, "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>")
else
return 1
/obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user)
..()
if(welded)
user << "It seems welded shut."
to_chat(user, "It seems welded shut.")
/obj/machinery/atmospherics/components/unary/vent_pump/power_change()
..()
code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+2 -2
View File
@@ -340,7 +340,7 @@
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0,user))
playsound(loc, WT.usesound, 40, 1)
user << "<span class='notice'>Now welding the scrubber.</span>"
to_chat(user, "<span class='notice'>Now welding the scrubber.</span>")
if(do_after(user, 20*W.toolspeed, target = src))
if(!src || !WT.isOn())
return
@@ -361,7 +361,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/can_unwrench(mob/user)
if(..())
if (!(stat & NOPOWER) && on)
user << "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>"
to_chat(user, "<span class='warning'>You cannot unwrench this [src], turn it off first!</span>")
else
return 1