shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
LetterJay
2017-02-27 16:29:50 -06:00
parent 586021483e 2cf17f19df
commit 7074b28401
17 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/update_icons.dm
+3 -2
View File
@@ -225,8 +225,9 @@
//CHECK FOR UPDATE
var/oldkey = icon_render_key
var/istaur = 0
if("taur" in dna.species.mutant_bodyparts && dna.features["taur"] != "None")
istaur = 0
if(ishuman(src))
if("taur" in dna.species.mutant_bodyparts && dna.features["taur"] != "None")
istaur = 1
icon_render_key = generate_icon_render_key()
if(oldkey == icon_render_key)
return
code/modules/projectiles/guns/ballistic/revolver.dm
+1
View File
@@ -100,6 +100,7 @@
options["Black Panther"] = "detective_panther"
options["Gold Trim"] = "detective_gold"
options["The Peacemaker"] = "detective_peacemaker"
options["The Spacemaker"] = "detective_future"
options["Cancel"] = null
/obj/item/weapon/gun/ballistic/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+3 -3
View File
@@ -43,14 +43,14 @@ All effects don't start immediately, but rather get worse over time; the rate is
if(istype(O,/obj/item/weapon/paper))
var/obj/item/weapon/paper/paperaffected = O
paperaffected.clearpaper()
usr << "<span class='notice'>[paperaffected]'s ink washes away.</span>"
O.visible_message("<span class='notice'>[paperaffected]'s ink washes away.</span>")
if(istype(O,/obj/item/weapon/book))
if(reac_volume >= 5)
var/obj/item/weapon/book/affectedbook = O
affectedbook.dat = null
usr << "<span class='notice'>Through thorough application, you wash away [affectedbook]'s writing.</span>"
O.visible_message("<span class='notice'>[affectedbook]'s writing washes away.</span>")
else
usr << "<span class='warning'>The ink smears, but doesn't wash away!</span>"
O.visible_message("<span class='warning'>The ink smears, but doesn't wash away!</span>")
return
/datum/reagent/consumable/ethanol/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with ethanol isn't quite as good as fuel.