cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 23:46:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into newEvents

Browse Source
This commit is contained in:
ReddeyfishVor
2018-03-31 11:12:26 -07:00
committed by GitHub
parent 0b0b25a2aa 4909f3f22b
commit e003b9296b
7 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+8 -8
View File
@@ -496,13 +496,13 @@ obj/structure/cable/proc/cableColor(var/colorC)
uses_charge = 1
charge_costs = list(1)
/obj/item/stack/cable_coil/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
if(locate(/obj/item/weapon/stool) in user.loc)
user.visible_message("<span class='suicide'>[user] is making a noose with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>")
else
user.visible_message("<span class='suicide'>[user] is strangling [TU.himself] with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>")
return(OXYLOSS)
// /obj/item/stack/cable_coil/suicide_act(mob/user)
// var/datum/gender/TU = gender_datums[user.get_visible_gender()]
// if(locate(/obj/item/weapon/stool) in user.loc)
// user.visible_message("<span class='suicide'>[user] is making a noose with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>")
// else
// user.visible_message("<span class='suicide'>[user] is strangling [TU.himself] with the [src.name]! It looks like [TU.he] [TU.is] trying to commit suicide.</span>")
// return(OXYLOSS)
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/param_color = null)
..()
@@ -938,4 +938,4 @@ obj/structure/cable/proc/cableColor(var/colorC)
if(get_dist(src, user) <= 1)
msg += " It doesn't seem to have a beginning, or an end."
to_chat(user, msg)
to_chat(user, msg)
code/modules/vore/appearance/sprite_accessories_vr.dm
+4 -3
View File
@@ -962,16 +962,17 @@
icon_state = "chimptail_s"
/datum/sprite_accessory/tail/special/seromitail
name = "seromi tail"
name = "teshari tail"
desc = ""
icon_state = "seromitail_s"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/tail/special/seromitailfeathered
name = "seromi tail w/ feathers"
name = "teshari tail w/ feathers"
desc = ""
icon_state = "seromitail_feathers_s"
icon_state = "seromitail_s"
extra_overlay = "seromitail_feathers_s"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
code/modules/vore/eating/living_vr.dm
+2
View File
@@ -593,6 +593,8 @@
to_chat(src, "<span class='notice'>You can taste the flavor of garbage and leftovers. Delicious?</span>")
else
to_chat(src, "<span class='notice'>You can taste the flavor of gluttonous waste of food.</span>")
else if(istype(I,/obj/item/weapon/storage/glass_ornament))
to_chat(src, "<span class='notice'>You can taste the flavor of smooth glass.</span>")
else
to_chat(src, "<span class='notice'>You can taste the flavor of garbage. Delicious.</span>")
return