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/hydroponics/grown/towercap.dm
+7 -7
View File
@@ -63,7 +63,7 @@
if(ST != plank && istype(ST, plank_type) && ST.amount < ST.max_amount)
ST.attackby(plank, user) //we try to transfer all old unfinished stacks to the new stack we created.
if(plank.amount > old_plank_amount)
user << "<span class='notice'>You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name].</span>"
to_chat(user, "<span class='notice'>You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name].</span>")
qdel(src)
if(is_type_in_list(W,accepted))
@@ -77,7 +77,7 @@
qdel(src)
return
else
usr << "<span class ='warning'>You must dry this first!</span>"
to_chat(usr, "<span class ='warning'>You must dry this first!</span>")
else
return ..()
@@ -115,7 +115,7 @@
R.use(1)
can_buckle = 1
buckle_requires_restraints = 1
user << "<span class='italics'>You add a rod to [src]."
to_chat(user, "<span class='italics'>You add a rod to [src].")
var/image/U = image(icon='icons/obj/hydroponics/equipment.dmi',icon_state="bonfire_rod",pixel_y=16)
underlays += U
if(W.is_hot())
@@ -124,7 +124,7 @@
/obj/structure/bonfire/attack_hand(mob/user)
if(burning)
user << "<span class='warning'>You need to extinguish [src] before removing the logs!"
to_chat(user, "<span class='warning'>You need to extinguish [src] before removing the logs!")
return
if(!has_buckled_mobs() && do_after(user, 50, target = src))
for(var/I in 1 to 5)
@@ -149,7 +149,7 @@
if(!burning && CheckOxygen())
icon_state = "bonfire_on_fire"
burning = 1
SetLuminosity(6)
set_light(6)
Burn()
START_PROCESSING(SSobj, src)
@@ -184,7 +184,7 @@
if(burning)
icon_state = "bonfire"
burning = 0
SetLuminosity(0)
set_light(0)
STOP_PROCESSING(SSobj, src)
/obj/structure/bonfire/buckle_mob(mob/living/M, force = 0)
@@ -193,4 +193,4 @@
/obj/structure/bonfire/unbuckle_mob(mob/living/buckled_mob, force=0)
if(..())
buckled_mob.pixel_y -= 13
buckled_mob.pixel_y -= 13