mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-29 15:06:39 +01:00
Merge branch 'master' into aro-taurriding
This commit is contained in:
Aronai Sieyes
@@ -270,6 +270,31 @@
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
|
||||
/datum/sprite_accessory/ears/teshari
|
||||
name = "Teshari (colorable fluff)"
|
||||
desc = ""
|
||||
icon_state = "teshari"
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
extra_overlay = "teshariinner"
|
||||
|
||||
/datum/sprite_accessory/ears/tesharihigh
|
||||
name = "Teshari upper ears (colorable fluff)"
|
||||
desc = ""
|
||||
icon_state = "tesharihigh"
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
extra_overlay = "tesharihighinner"
|
||||
|
||||
/datum/sprite_accessory/ears/tesharilow
|
||||
name = "Teshari lower ears (colorable fluff)"
|
||||
desc = ""
|
||||
icon_state = "tesharilow"
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
extra_overlay = "tesharilowinner"
|
||||
|
||||
|
||||
// Special snowflake ears go below here.
|
||||
|
||||
/datum/sprite_accessory/ears/molenar_kitsune
|
||||
@@ -896,6 +921,14 @@
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
extra_overlay = "deertail_mark"
|
||||
|
||||
/datum/sprite_accessory/tail/teshari_fluffytail
|
||||
name = "Teshari alternative, colorable"
|
||||
desc = ""
|
||||
icon_state = "teshari_fluffytail"
|
||||
extra_overlay = "teshari_fluffytail_mark"
|
||||
do_colouration = 1
|
||||
color_blend_mode = ICON_MULTIPLY
|
||||
|
||||
//For all species tails. Includes haircolored tails.
|
||||
/datum/sprite_accessory/tail/special
|
||||
name = "Blank tail. Do not select."
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
|
||||
next_process = times_fired + (6 SECONDS/wait) //Set up our next process time.
|
||||
var/play_sound //Potential sound to play at the end to avoid code duplication.
|
||||
var/to_update = FALSE //Did anything update worthy happen?
|
||||
|
||||
/////////////////////////// Auto-Emotes ///////////////////////////
|
||||
if(contents.len && next_emote <= times_fired)
|
||||
@@ -41,7 +42,7 @@
|
||||
items_preserved |= I
|
||||
else
|
||||
digest_item(I)
|
||||
owner.updateVRPanel()
|
||||
to_update = TRUE
|
||||
did_an_item = TRUE
|
||||
|
||||
//Handle eaten mobs
|
||||
@@ -72,8 +73,7 @@
|
||||
items_preserved |= I
|
||||
else
|
||||
digest_item(I)
|
||||
owner.updateVRPanel()
|
||||
H.updateVRPanel()
|
||||
to_update = TRUE
|
||||
break
|
||||
|
||||
///////////////////////////// DM_HOLD /////////////////////////////
|
||||
@@ -113,6 +113,7 @@
|
||||
play_sound = pick(death_sounds)
|
||||
digestion_death(M)
|
||||
owner.update_icons()
|
||||
to_update = TRUE
|
||||
continue
|
||||
|
||||
// Deal digestion damage (and feed the pred)
|
||||
@@ -128,9 +129,6 @@
|
||||
owner.nutrition += offset*(2*(digest_brute+digest_burn)/difference) // 9.5 nutrition per digestion tick if they're 130 pounds and it's same size. 10.2 per digestion tick if they're 140 and it's same size. Etc etc.
|
||||
else
|
||||
owner.nutrition += 2*(digest_brute+digest_burn)/difference
|
||||
M.updateVRPanel()
|
||||
|
||||
owner.updateVRPanel()
|
||||
|
||||
//////////////////////////// DM_ABSORB ////////////////////////////
|
||||
else if(digest_mode == DM_ABSORB)
|
||||
@@ -149,6 +147,7 @@
|
||||
owner.nutrition += oldnutrition
|
||||
else if(M.nutrition < 100) //When they're finally drained.
|
||||
absorb_living(M)
|
||||
to_update = TRUE
|
||||
|
||||
//////////////////////////// DM_UNABSORB ////////////////////////////
|
||||
else if(digest_mode == DM_UNABSORB)
|
||||
@@ -161,6 +160,7 @@
|
||||
to_chat(M,"<span class='notice'>You suddenly feel solid again </span>")
|
||||
to_chat(owner,"<span class='notice'>You feel like a part of you is missing.</span>")
|
||||
owner.nutrition -= 100
|
||||
to_update = TRUE
|
||||
|
||||
//////////////////////////// DM_DRAIN ////////////////////////////
|
||||
else if(digest_mode == DM_DRAIN)
|
||||
@@ -254,4 +254,11 @@
|
||||
/////////////////////////// Make any noise ///////////////////////////
|
||||
if(play_sound)
|
||||
playsound(src, play_sound, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, ignore_walls = TRUE, preference = /datum/client_preference/digestion_noises)
|
||||
if(to_update)
|
||||
for(var/mob/living/M in contents)
|
||||
if(M.client)
|
||||
M.updateVRPanel()
|
||||
if(owner.client)
|
||||
owner.updateVRPanel()
|
||||
|
||||
return SSBELLIES_PROCESSED
|
||||
|
||||
@@ -507,7 +507,7 @@
|
||||
selected.name = new_name
|
||||
|
||||
if(href_list["b_mode"])
|
||||
var/list/menu_list = selected.digest_modes
|
||||
var/list/menu_list = selected.digest_modes.Copy()
|
||||
if(istype(usr,/mob/living/carbon/human))
|
||||
menu_list += DM_TRANSFORM
|
||||
|
||||
@@ -526,7 +526,7 @@
|
||||
selected.items_preserved.Cut() //Re-evaltuate all items in belly on belly-mode change
|
||||
|
||||
if(href_list["b_addons"])
|
||||
var/list/menu_list = selected.mode_flag_list
|
||||
var/list/menu_list = selected.mode_flag_list.Copy()
|
||||
var/toggle_addon = input("Toggle Addon") as null|anything in menu_list
|
||||
if(!toggle_addon)
|
||||
return 0
|
||||
|
||||
@@ -172,27 +172,6 @@
|
||||
can_hold = list(/obj/item/clothing/under/swimsuit/)
|
||||
has_items = list(/obj/item/clothing/under/swimsuit/fluff/penelope)
|
||||
|
||||
//Arokha:Aronai Kadigan
|
||||
/obj/item/weapon/storage/backpack/satchel/gen/fluff/aronai
|
||||
name = "blue medical satchel"
|
||||
desc = "A medical satchel done up in blue and white."
|
||||
|
||||
New()
|
||||
..() //Might look like a lot... but all small items.
|
||||
//Centcom stuff and permit
|
||||
new /obj/item/weapon/card/id/centcom/station/fluff/aronai(src)
|
||||
//new /obj/item/clothing/accessory/permit/gun/fluff/aronai_kadigan(src)
|
||||
//Gun and holster
|
||||
//new /obj/item/weapon/gun/projectile/nsfw(src)
|
||||
//new /obj/item/ammo_magazine/nsfw_mag(src)
|
||||
//new /obj/item/ammo_casing/nsfw_batt/stun(src)
|
||||
//new /obj/item/ammo_casing/nsfw_batt/stun(src)
|
||||
//new /obj/item/ammo_casing/nsfw_batt/net(src)
|
||||
//new /obj/item/clothing/accessory/holster(src)
|
||||
|
||||
/obj/item/weapon/storage/backpack/satchel/gen/fluff/aronai/digest_act(...)
|
||||
return FALSE //I get eaten a lot, okay
|
||||
|
||||
//Aerowing:Sebastian Aji
|
||||
/obj/item/weapon/storage/box/fluff/sebastian_aji
|
||||
name = "Sebastian's Lumoco Arms P3 Box"
|
||||
|
||||
@@ -1797,3 +1797,14 @@ Departamental Swimsuits, for general use
|
||||
else
|
||||
H << "<span class='warning'>This suit is not designed for you.</span>"
|
||||
return 0
|
||||
|
||||
//Zigfe:Zaoozaoo Xrimxuqmqixzix
|
||||
/obj/item/clothing/head/fluff/zao
|
||||
name = "Zao's Hat"
|
||||
desc = "A black hat that has an uncanny similarity to the HoS's hat. There's a small letter Z sewn on the inside of the brim."
|
||||
|
||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||
icon_state = "zao_cap"
|
||||
|
||||
icon_override = 'icons/vore/custom_clothes_vr.dmi'
|
||||
item_state = "zao_cap_mob"
|
||||
@@ -347,6 +347,11 @@
|
||||
name = "\improper MEUSOC .45"
|
||||
desc = "Some serious drywall work, coming up!"
|
||||
*/
|
||||
//hzdonut:Jesse Soemmer
|
||||
/obj/item/weapon/gun/projectile/revolver/fluff/jesselemat
|
||||
name = "Modified LeMat"
|
||||
desc = "The LeMat Revolver is a 9 shot revolver with a secondary firing barrel for loading shotgun shells. Uses .38-Special and 12g rounds depending on the barrel. This one appears to have had it's secondary barrel sealed off and looks to be in pristine condition. Either it's brand new, or its owner takes very good care of it."
|
||||
icon_state = "lemat"
|
||||
|
||||
//////////////////// Energy Weapons ////////////////////
|
||||
|
||||
@@ -794,4 +799,4 @@
|
||||
if(T.z in using_map.map_levels)
|
||||
to_chat(user, "<span class='warning'>The safety device prevents the gun from firing this close to the facility.</span>")
|
||||
return 0
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -51,6 +51,11 @@
|
||||
name = "Sorrel Cavalet's Sidearm Permit"
|
||||
desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on September 26th, 2562."
|
||||
|
||||
// hzdonut:Jesse Soemmer
|
||||
/obj/item/clothing/accessory/permit/gun/fluff/JesseSoemmer
|
||||
name = "Jesse Soemmer's Sidearm Permit"
|
||||
desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on March 4, 2563."
|
||||
|
||||
/* Legacy Permits
|
||||
// BEGIN - PROTOTYPE
|
||||
/obj/item/clothing/accessory/permit/gun/fluff
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
name = "\improper MPA6 \'Sickshot\'"
|
||||
desc = "Need to stun someone? Don't mind having to clean up the mess afterwards? The Sickshot is the answer to your prayers. \
|
||||
Using a short-range concentrated blast of disruptive sound, the Sickshot will nauseate and confuse the target for several seconds. NOTE: Not suitable \
|
||||
for use in vacuum, or on animals. May cause contraction and release of various 'things' from various 'orifices'."
|
||||
for use in vacuum. Usage on animals may cause panic and rage without stunning. May cause contraction and release of various 'things' from various 'orifices', even if the target is already dead."
|
||||
|
||||
description_info = "This gun causes nausea in targets, stunning them briefly and causing vomiting. It will also cause them to vomit up prey, sometimes. Repeated shots may help in that case."
|
||||
description_fluff = ""
|
||||
|
||||
Reference in New Issue
Block a user