Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1142 from Erthilo/master

Fixes Tajaran spawning as humans with furry bits. Fixes cyborgs using recharges. Fixes medical messages.
  • Loading branch information...
commit c1a90c1b7a44167b89bba3a96def5c7d963d4a43 2 parents b89e45c + 5c3cdda
Mloc authored
View
3  code/game/machinery/recharger.dm
@@ -12,6 +12,9 @@ obj/machinery/recharger
obj/item/weapon/melee/baton/charging2 = null
attackby(obj/item/weapon/G as obj, mob/user as mob)
+ if(issilicon(user))
+ return
+
if (istype(G, /obj/item/weapon/gun/energy))
if (src.charging || src.charging2)
return
View
2  code/game/objects/items/weapons/medical.dm
@@ -37,7 +37,7 @@ MEDICAL
if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
affecting = M:get_organ("head")
if(affecting.destroyed && !affecting.gauzed)
- user.visible_message("\red You do your best to stop the bleeding from [M]'s stump.", "\red [user] does [user.gender == MALE? "his" : "her"] best to stem [M]'s bleeding from [M.gender == MALE? "his" : "her"] stump.", "\red You hear something like gauze being ripped.")
+ user.visible_message("\red [user] does [user.gender == MALE? "his" : "her"] best to stem [M]'s bleeding from [M.gender == MALE? "his" : "her"] stump.", "\red You do your best to stop the bleeding from [M]'s stump.", "\red You hear something like gauze being ripped.")
affecting.gauzed = 1
use(1)
return
View
5 code/modules/mob/living/carbon/human/human.dm
@@ -149,6 +149,11 @@
fixblood()
..()
+
+ spawn(5) // Failsafe for.. weirdness.
+ update_clothing()
+ update_body()
+
/*var/known_languages = list()
known_languages.Add("english")*/
Please sign in to comment.
Something went wrong with that request. Please try again.