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/surgery/bodyparts/bodyparts.dm
+7 -3
View File
@@ -43,9 +43,9 @@
/obj/item/bodypart/examine(mob/user)
..()
if(brute_dam > 0)
user << "<span class='warning'>This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.</span>"
to_chat(user, "<span class='warning'>This limb has [brute_dam > 30 ? "severe" : "minor"] bruising.</span>")
if(burn_dam > 0)
user << "<span class='warning'>This limb has [burn_dam > 30 ? "severe" : "minor"] burns.</span>"
to_chat(user, "<span class='warning'>This limb has [burn_dam > 30 ? "severe" : "minor"] burns.</span>")
/obj/item/bodypart/blob_act()
take_damage(max_damage)
@@ -76,7 +76,7 @@
if(W.sharpness)
add_fingerprint(user)
if(!contents.len)
user << "<span class='warning'>There is nothing left inside [src]!</span>"
to_chat(user, "<span class='warning'>There is nothing left inside [src]!</span>")
return
playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
user.visible_message("<span class='warning'>[user] begins to cut open [src].</span>",\
@@ -115,6 +115,10 @@
brute = max(0, brute - 5)
burn = max(0, burn - 4)
switch(animal_origin)
if(ALIEN_BODYPART,LARVA_BODYPART) //aliens take double burn
burn *= 2
var/can_inflict = max_damage - (brute_dam + burn_dam)
if(!can_inflict)
return 0
code/modules/surgery/bodyparts/robot_bodyparts.dm
+13 -13
View File
@@ -58,23 +58,23 @@
/obj/item/bodypart/chest/robot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/stock_parts/cell))
if(src.cell)
user << "<span class='warning'>You have already inserted a cell!</span>"
to_chat(user, "<span class='warning'>You have already inserted a cell!</span>")
return
else
if(!user.transferItemToLoc(W, src))
return
src.cell = W
user << "<span class='notice'>You insert the cell.</span>"
to_chat(user, "<span class='notice'>You insert the cell.</span>")
else if(istype(W, /obj/item/stack/cable_coil))
if(src.wired)
user << "<span class='warning'>You have already inserted wire!</span>"
to_chat(user, "<span class='warning'>You have already inserted wire!</span>")
return
var/obj/item/stack/cable_coil/coil = W
if (coil.use(1))
src.wired = 1
user << "<span class='notice'>You insert the wire.</span>"
to_chat(user, "<span class='notice'>You insert the wire.</span>")
else
user << "<span class='warning'>You need one length of coil to wire it!</span>"
to_chat(user, "<span class='warning'>You need one length of coil to wire it!</span>")
else
return ..()
@@ -111,10 +111,10 @@
if(istype(W, /obj/item/device/assembly/flash/handheld))
var/obj/item/device/assembly/flash/handheld/F = W
if(src.flash1 && src.flash2)
user << "<span class='warning'>You have already inserted the eyes!</span>"
to_chat(user, "<span class='warning'>You have already inserted the eyes!</span>")
return
else if(F.crit_fail)
user << "<span class='warning'>You can't use a broken flash!</span>"
to_chat(user, "<span class='warning'>You can't use a broken flash!</span>")
return
else
if(!user.transferItemToLoc(F, src))
@@ -123,11 +123,11 @@
src.flash2 = F
else
src.flash1 = F
user << "<span class='notice'>You insert the flash into the eye socket.</span>"
to_chat(user, "<span class='notice'>You insert the flash into the eye socket.</span>")
else if(istype(W, /obj/item/weapon/crowbar))
if(flash1 || flash2)
playsound(src.loc, W.usesound, 50, 1)
user << "<span class='notice'>You remove the flash from [src].</span>"
to_chat(user, "<span class='notice'>You remove the flash from [src].</span>")
if(flash1)
flash1.forceMove(user.loc)
flash1 = null
@@ -135,7 +135,7 @@
flash2.forceMove(user.loc)
flash2 = null
else
user << "<span class='warning'>There are no flash to remove from [src].</span>"
to_chat(user, "<span class='warning'>There are no flash to remove from [src].</span>")
else
return ..()
@@ -177,15 +177,15 @@
max_damage = 20
/obj/item/bodypart/l_leg/robot/surplus
name = "surplus prosthetic leg"
name = "surplus prosthetic left leg"
desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
icon = 'icons/mob/augments.dmi'
icon_state = "surplus_l_leg"
max_damage = 20
/obj/item/bodypart/r_leg/robot/surplus
name = "surplus prosthetic leg"
name = "surplus prosthetic right leg"
desc = "A skeletal, robotic limb. Outdated and fragile, but it's still better than nothing."
icon = 'icons/mob/augments.dmi'
icon_state = "surplus_r_leg"
max_damage = 20
max_damage = 20