Merge pull request #12 from quotefox/master

update
This commit is contained in:
Chloe
2021-04-07 19:08:16 +01:00
committed by GitHub
119 changed files with 8975 additions and 129527 deletions
File diff suppressed because it is too large Load Diff
+3
View File
@@ -89,6 +89,9 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isxenoperson(A) (is_species(A, /datum/species/xeno))
#define isstartjelly(A) (is_species(A, /datum/species/jelly/roundstartslime))
// Hyperstation Carbon Stuff
#define iswendigo(A) (istype(A, /mob/living/carbon/wendigo))
//more carbon mobs
#define ismonkey(A) (istype(A, /mob/living/carbon/monkey))
+1
View File
@@ -69,6 +69,7 @@
#define ALIEN_BODYPART "alien"
#define LARVA_BODYPART "larva"
#define DEVIL_BODYPART "devil"
#define WENDIGO_BODYPART "wendigo"
/*see __DEFINES/inventory.dm for bodypart bitflag defines*/
// Health/damage defines for carbon mobs
+7 -1
View File
@@ -10,6 +10,7 @@
#define CHANNEL_BUZZ 1018
#define CHANNEL_BICYCLE 1017
//CIT CHANNELS - TRY NOT TO REGRESS
#define CHANNEL_PRED 1010
#define CHANNEL_DIGEST 1009
@@ -126,4 +127,9 @@
#define SOUND_AREA_WOODFLOOR SOUND_ENVIRONMENT_CITY
#define INTERACTION_SOUND_RANGE_MODIFIER -3
#define EQUIP_SOUND_VOLUME 30
#define EQUIP_SOUND_VOLUME 30
#define PICKUP_SOUND_VOLUME 40
#define DROP_SOUND_VOLUME 50
#define YEET_SOUND_VOLUME 90
+4 -4
View File
@@ -33,10 +33,10 @@ SUBSYSTEM_DEF(input)
"Tab" = "\".winset \\\"input.focus=true?map.focus=true input.background-color=[COLOR_INPUT_DISABLED]:input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
"O" = "ooc",
"Ctrl+O" = "looc",
"Ctrl+T" = "say",
"Ctrl+T" = "say_indicator",
"T" = "say_indicator",
"Y" = "whisper",
"Ctrl+M" = "me",
"Ctrl+M" = "me_indicato",
"M" = "me_indicator",
"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
"Any" = "\"KeyDown \[\[*\]\]\"",
@@ -50,9 +50,9 @@ SUBSYSTEM_DEF(input)
"old_hotkeys" = list(
"Tab" = "\".winset \\\"mainwindow.macro=old_default input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"",
"O" = "ooc",
"T" = "say",
"T" = "say_indicator",
"Ctrl+T" = "say_indicator",
"M" = "me",
"M" = "me_indicator",
"Ctrl+M" = "me_indicator",
"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"", // This makes it so backspace can remove default inputs
"Any" = "\"KeyDown \[\[*\]\]\"",
@@ -134,7 +134,7 @@
if(ismob(parent.loc) && isitem(AM))
var/obj/item/I = AM
var/mob/M = parent.loc
I.dropped(M)
I.dropped(M, TRUE)
if(new_location)
//Reset the items values
_removal_reset(AM)
@@ -22,7 +22,7 @@
required_enemies = 2
recommended_enemies = 4
reroll_friendly = FALSE
enemy_minimum_age = 7
enemy_minimum_age = 21
round_ends_with_antag_death = FALSE
+1 -1
View File
@@ -136,7 +136,7 @@ Credit where due:
required_players = 35
required_enemies = 3
recommended_enemies = 5
enemy_minimum_age = 7
enemy_minimum_age = 28
protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //Silicons can eventually be converted
restricted_jobs = list("Chaplain", "Captain")
announce_span = "brass"
+1 -1
View File
@@ -43,7 +43,7 @@
required_players = 30
required_enemies = 3
recommended_enemies = 5
enemy_minimum_age = 7
enemy_minimum_age = 28
announce_span = "cult"
announce_text = "Some crew members are trying to start a cult to Nar'Sie!\n\
@@ -275,7 +275,7 @@
// LEWD //
// //
//////////////////////////////////////////
/* //Putting Lewd traitor on the backburner until we can buffer it a bit.
/datum/dynamic_ruleset/midround/autotraitor/lewd
name = "Horny Traitor"
persistent = TRUE
@@ -375,7 +375,7 @@
var/datum/antagonist/traitor/lewd/newTraitor = new
M.mind.add_antag_datum(newTraitor)
return TRUE
*/
//////////////////////////////////////////////
// //
// Malfunctioning AI //
@@ -66,7 +66,7 @@
// LEWD //
// //
//////////////////////////////////////////
/* //Putting Lewd traitor on the backburner until we can buffer it a bit.
/datum/dynamic_ruleset/roundstart/traitor/lewd
name = "Horny Traitor"
persistent = TRUE
@@ -115,7 +115,7 @@
M.mind.restricted_roles = restricted_roles
return TRUE
*/
//////////////////////////////////////////
// //
// BLOOD BROTHERS //
+1 -1
View File
@@ -34,7 +34,7 @@
var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted
var/reroll_friendly //During mode conversion only these are in the running
var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die
var/enemy_minimum_age = 7 //How many days must players have been playing before they can play this antagonist
var/enemy_minimum_age = 21 //How many days must players have been playing before they can play this antagonist
var/announce_span = "warning" //The gamemode's name will be in this span during announcement.
var/announce_text = "This gamemode forgot to set a descriptive text! Uh oh!" //Used to describe a gamemode when it's announced.
+1 -1
View File
@@ -6,7 +6,7 @@
required_enemies = 2
recommended_enemies = 5
antag_flag = ROLE_OPERATIVE
enemy_minimum_age = 7
enemy_minimum_age = 21
announce_span = "danger"
announce_text = "Syndicate forces are approaching the station in an attempt to destroy it!\n\
+1 -1
View File
@@ -16,7 +16,7 @@
required_players = 30
required_enemies = 2
recommended_enemies = 3
enemy_minimum_age = 14
enemy_minimum_age = 28
announce_span = "danger"
announce_text = "Some crewmembers are attempting a coup!\n\
+1 -1
View File
@@ -16,7 +16,7 @@
required_enemies = 1
recommended_enemies = 4
reroll_friendly = 1
enemy_minimum_age = 0
enemy_minimum_age = 21
announce_span = "danger"
announce_text = "There are Syndicate agents on the station!\n\
+1 -1
View File
@@ -10,7 +10,7 @@
required_players = 20
required_enemies = 1
recommended_enemies = 1
enemy_minimum_age = 7
enemy_minimum_age = 21
round_ends_with_antag_death = 1
announce_span = "danger"
announce_text = "There is a space wizard attacking the station!\n\
@@ -285,7 +285,7 @@
// OMG CENTCOM LETTERHEAD
if("MessageCentCom")
if(authenticated==2)
if(authenticated)
if(!checkCCcooldown())
to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
return
@@ -301,7 +301,7 @@
// OMG SYNDICATE ...LETTERHEAD
if("MessageSyndicate")
if((authenticated==2) && (obj_flags & EMAGGED))
if((authenticated) && (obj_flags & EMAGGED))
if(!checkCCcooldown())
to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
@@ -483,6 +483,11 @@
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=cancelshuttle'>Cancel Shuttle Call</A> \]"
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=status'>Set Status Display</A> \]"
if(!(obj_flags & EMAGGED))
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageCentCom'>Send Message to CentCom</A> \]"
else
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageSyndicate'>Send Message to \[UNKNOWN\]</A> \]"
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"
if (authenticated==2)
dat += "<BR><BR><B>Captain Functions</B>"
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=announce'>Make a Captain's Announcement</A> \]"
@@ -494,11 +499,6 @@
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=changeseclevel'>Change Alert Level</A> \]"
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
if(!(obj_flags & EMAGGED))
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageCentCom'>Send Message to CentCom</A> \]"
else
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageSyndicate'>Send Message to \[UNKNOWN\]</A> \]"
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"
else
dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=login'>Log In</A> \]"
if(STATE_CALLSHUTTLE)
+4 -4
View File
@@ -79,8 +79,8 @@
var/doorOpen = 'sound/machines/airlock.ogg'
var/doorClose = 'sound/machines/airlockclose.ogg'
var/doorDeni = 'sound/machines/deniedbeep.ogg' // i'm thinkin' Deni's
var/boltUp = 'sound/machines/boltsup.ogg'
var/boltDown = 'sound/machines/boltsdown.ogg'
var/boltUp = 'hyperstation/sound/machines/BoltsUp.ogg'
var/boltDown = 'hyperstation/sound/machines/BoltsDown.ogg'
var/noPower = 'sound/machines/doorclick.ogg'
var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to
var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass"
@@ -1155,7 +1155,7 @@
if(obj_flags & EMAGGED)
return FALSE
use_power(50)
playsound(src, doorOpen, 30, 1)
playsound(src, doorOpen, 40, 0)
if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
src.closeOther.close()
else
@@ -1202,7 +1202,7 @@
if(obj_flags & EMAGGED)
return
use_power(50)
playsound(src.loc, doorClose, 30, 1)
playsound(src.loc, doorClose, 40, 0)
else
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
+4 -2
View File
@@ -15,6 +15,8 @@
resistance_flags = FIRE_PROOF
damage_deflection = 70
poddoor = TRUE
var/openSound = 'hyperstation/sound/machines/blastDoorOpen.ogg'
var/closeSound = 'hyperstation/sound/machines/blastDoorClose.ogg'
/obj/machinery/door/poddoor/preopen
icon_state = "open"
@@ -72,10 +74,10 @@
switch(animation)
if("opening")
flick("opening", src)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
playsound(src, openSound, 20, 0)
if("closing")
flick("closing", src)
playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
playsound(src, closeSound, 20, 0)
/obj/machinery/door/poddoor/update_icon()
if(density)
+2
View File
@@ -8,6 +8,8 @@
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
damage_deflection = 20
max_integrity = 100
openSound = 'hyperstation/sound/machines/shutter.ogg'
closeSound = 'hyperstation/sound/machines/shutter.ogg'
/obj/machinery/door/poddoor/shutters/preopen
icon_state = "open"
+2 -2
View File
@@ -141,7 +141,7 @@
if(!src.operating) //in case of emag
operating = TRUE
do_animate("opening")
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
playsound(src.loc, 'hyperstation/sound/machines/windowdoor.ogg', 70, 0)
src.icon_state ="[src.base_state]open"
sleep(10)
@@ -165,7 +165,7 @@
return 0
operating = TRUE
do_animate("closing")
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
playsound(src.loc, 'hyperstation/sound/machines/windowdoor.ogg', 70, 0)
src.icon_state = src.base_state
density = TRUE
+29 -4
View File
@@ -32,7 +32,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/hitsound
var/usesound
var/throwhitsound
var/mob_throw_hit_sound
///Sound uses when picking the item up (into your hands)
var/pickup_sound
///Sound uses when dropping the item, or when its thrown.
var/drop_sound
///Sound used when equipping the item into a valid slot
var/equip_sound
@@ -376,7 +382,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/proc/talk_into(mob/M, input, channel, spans, datum/language/language)
return ITALICS | REDUCE_RANGE
/obj/item/proc/dropped(mob/user)
/obj/item/proc/dropped(mob/user, silent)
for(var/X in actions)
var/datum/action/A = X
A.Remove(user)
@@ -384,6 +390,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
qdel(src)
item_flags &= ~IN_INVENTORY
SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user)
if(!silent)
playsound(src, drop_sound, DROP_SOUND_VOLUME, ignore_walls = FALSE)
// called just as an item is picked up (loc is not yet changed)
/obj/item/proc/pickup(mob/user)
@@ -427,8 +435,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
A.Grant(user)
item_flags |= IN_INVENTORY
if(equip_sound && (slot_flags & slotdefine2slotbit(slot)))
if(equip_sound &&(slot_flags & slotdefine2slotbit(slot)))
playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)
else if(slot == SLOT_HANDS)
playsound(src, pickup_sound, PICKUP_SOUND_VOLUME, ignore_walls = FALSE)
//sometimes we only want to grant the item's action if it's equipped in a specific slot.
/obj/item/proc/item_action_slot_check(slot, mob/user)
@@ -582,6 +592,21 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/itempush = 1
if(w_class < 4)
itempush = 0 //too light to push anything
if(istype(hit_atom, /mob/living)) //Living mobs handle hit sounds differently.
var/volume = get_volume_by_throwforce_and_or_w_class()
if (throwforce > 0)
if (mob_throw_hit_sound)
playsound(hit_atom, mob_throw_hit_sound, volume, TRUE, -1)
else if(hitsound)
playsound(hit_atom, hitsound, volume, TRUE, -1)
else
playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1)
else
playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
else
playsound(src, drop_sound, YEET_SOUND_VOLUME, ignore_walls = FALSE)
return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum)
/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, messy_throw = TRUE)
@@ -853,7 +878,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
layer = initial(layer)
plane = initial(plane)
appearance_flags &= ~NO_CLIENT_COLOR
dropped(M)
dropped(M, FALSE)
return ..()
/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback)
@@ -32,6 +32,9 @@
var/datum/integrated_io/selected_io = null //functional for integrated circuits.
var/mode = 0
drop_sound = 'sound/items/handling/multitool_drop.ogg'
pickup_sound = 'sound/items/handling/multitool_pickup.ogg'
/obj/item/multitool/examine(mob/user)
. = ..()
if(selected_io)
@@ -200,6 +200,7 @@
if(!language)
language = M.get_default_language()
INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language)
playsound(src, 'sound/voice/radioin.ogg', 25, 0)
return ITALICS | REDUCE_RANGE
/obj/item/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language)
@@ -355,6 +355,9 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
merge_type = /obj/item/stack/sheet/cloth
grind_results = list(/datum/reagent/cellulose = 4)
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
/obj/item/stack/sheet/cloth/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.cloth_recipes
return ..()
@@ -400,6 +403,11 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
merge_type = /obj/item/stack/sheet/durathread
grind_results = list(/datum/reagent/cellulose = 10)
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
/obj/item/stack/sheet/durathread/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.durathread_recipes
return ..()
+2
View File
@@ -12,6 +12,8 @@
var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
var/worn_overlays = FALSE //worn counterpart of the above.
equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
drop_sound = 'sound/items/handling/toolbelt_drop.ogg'
pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg'
/obj/item/storage/belt/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] begins belting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+5
View File
@@ -35,6 +35,9 @@
var/illustration = "writing"
rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE //exploits ahoy
drop_sound = 'sound/items/handling/cardboardbox_drop.ogg'
pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg'
/obj/item/storage/box/Initialize(mapload)
. = ..()
update_icon()
@@ -643,6 +646,8 @@
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT
price = 2
drop_sound = 'sound/items/handling/matchbox_drop.ogg'
pickup_sound = 'sound/items/handling/matchbox_pickup.ogg'
/obj/item/storage/box/matches/ComponentInitialize()
. = ..()
@@ -16,6 +16,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
materials = list(MAT_METAL = 500)
attack_verb = list("robusted")
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
var/latches = "single_latch"
var/has_latches = TRUE
var/can_rubberify = TRUE
+3
View File
@@ -13,6 +13,9 @@
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=50)
drop_sound = 'sound/items/handling/crowbar_drop.ogg'
pickup_sound = 'sound/items/handling/crowbar_pickup.ogg'
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
tool_behaviour = TOOL_CROWBAR
toolspeed = 1
@@ -19,6 +19,8 @@
usesound = list('sound/items/screwdriver.ogg', 'sound/items/screwdriver2.ogg')
tool_behaviour = TOOL_SCREWDRIVER
toolspeed = 1
drop_sound = 'sound/items/handling/screwdriver_drop.ogg'
pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
var/random_color = TRUE //if the screwdriver uses random coloring
var/static/list/screwdriver_colors = list(
@@ -34,6 +34,9 @@
tool_behaviour = TOOL_WELDER
toolspeed = 1
drop_sound = 'sound/items/handling/weldingtool_drop.ogg'
pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg'
/obj/item/weldingtool/Initialize()
. = ..()
create_reagents(max_fuel)
@@ -17,6 +17,9 @@
hitsound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/wirecutter.ogg'
drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
pickup_sound = 'sound/items/handling/wirecutter_pickup.ogg'
tool_behaviour = TOOL_WIRECUTTER
toolspeed = 1
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
+3
View File
@@ -13,6 +13,9 @@
usesound = 'sound/items/ratchet.ogg'
materials = list(MAT_METAL=150)
drop_sound = 'sound/items/handling/wrench_drop.ogg'
pickup_sound = 'sound/items/handling/wrench_pickup.ogg'
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
tool_behaviour = TOOL_WRENCH
toolspeed = 1
@@ -727,3 +727,9 @@
qdel(src)
building = FALSE
/obj/structure/rack/shelf
name = "shelving"
desc = "Some nice metal shelves."
icon = 'hyperstation/icons/obj/objects.dmi'
icon_state = "shelf"
@@ -609,6 +609,8 @@ This is here to make the tiles around the station mininuke change when it's arme
lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi'
icon_state = "datadisk0"
drop_sound = 'sound/items/handling/disk_drop.ogg'
pickup_sound = 'sound/items/handling/disk_pickup.ogg'
/obj/item/disk/nuclear
name = "nuclear authentication disk"
+2
View File
@@ -10,6 +10,8 @@
var/togglename = null
var/suittoggled = FALSE
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
var/adjusted = NORMAL_STYLE
mutantrace_variation = MUTANTRACE_VARIATION
var/tauric = FALSE //Citadel Add for tauric hardsuits
+3
View File
@@ -18,6 +18,9 @@
mutantrace_variation = MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
equip_sound = 'sound/items/equip/jumpsuit_equip.ogg'
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
. = list()
if(!isinhands)
@@ -12,6 +12,9 @@
resistance_flags = ACID_PROOF
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
cut_overlays()
if(reagents.reagent_list.len)
+2
View File
@@ -193,6 +193,8 @@
var/unique = 0 //0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
var/title //The real name of the book.
var/window_size = null // Specific window size for the book, i.e: "1920x1080", Size x Width
drop_sound = 'sound/items/handling/book_drop.ogg'
pickup_sound = 'sound/items/handling/book_pickup.ogg'
/obj/item/book/attack_self(mob/user)
if(is_blind(user))
+3 -15
View File
@@ -105,7 +105,7 @@
return
/mob/living/proc/can_embed(obj/item/I)
return FALSE
return FALSE
/mob/living/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum)
var/obj/item/I
@@ -126,22 +126,10 @@
return TRUE
var/zone = ran_zone(BODY_ZONE_CHEST, 65)//Hits a random part of the body, geared towards the chest
var/dtype = BRUTE
var/volume = I.get_volume_by_throwforce_and_or_w_class()
SEND_SIGNAL(I, COMSIG_MOVABLE_IMPACT_ZONE, src, zone)
dtype = I.damtype
if (I.throwforce > 0) //If the weapon's throwforce is greater than zero...
if (I.throwhitsound) //...and throwhitsound is defined...
playsound(loc, I.throwhitsound, volume, 1, -1) //...play the weapon's throwhitsound.
else if(I.hitsound) //Otherwise, if the weapon's hitsound is defined...
playsound(loc, I.hitsound, volume, 1, -1) //...play the weapon's hitsound.
else if(!I.throwhitsound) //Otherwise, if throwhitsound isn't defined...
playsound(loc, 'sound/weapons/genhit.ogg',volume, 1, -1) //...play genhit.ogg.
else if(!I.throwhitsound && I.throwforce > 0) //Otherwise, if the item doesn't have a throwhitsound and has a throwforce greater than zero...
playsound(loc, 'sound/weapons/genhit.ogg', volume, 1, -1)//...play genhit.ogg
if(!I.throwforce)// Otherwise, if the item's throwforce is 0...
playsound(loc, 'sound/weapons/throwtap.ogg', 1, volume, -1)//...play throwtap.ogg.
if(!blocked)
visible_message("<span class='danger'>[src] has been hit by [I].</span>", \
"<span class='userdanger'>[src] has been hit by [I].</span>")
@@ -397,7 +385,7 @@
if (INTENT_GRAB)
grabbedby(M)
return FALSE
if(INTENT_HARM)
if(INTENT_HARM)
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
return FALSE
+1 -1
View File
@@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
if (client?.prefs.chat_on_map && stat != UNCONSCIOUS && (client.prefs.see_chat_non_mob || ismob(speaker)) && can_hear())
create_chat_message(speaker, message_language, raw_message, spans, message_mode)
if (client?.prefs.radiosounds && stat != UNCONSCIOUS && can_hear() && radio_freq)
playsound_local(src,'sound/voice/radio.ogg', 30, 1)
playsound_local(src,'sound/voice/radio.ogg', 30, 0)
// Recompose message for AI hrefs, language incomprehension.
message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode, FALSE, source)
+4
View File
@@ -23,6 +23,9 @@
dog_fashion = /datum/dog_fashion/head
grind_results = list(/datum/reagent/cellulose = 2)
drop_sound = 'sound/items/handling/paper_drop.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
var/info //What's actually written on the paper.
var/info_links //A different version of the paper which includes html links at fields and EOF
var/stamps //The (text for the) stamps on the paper.
@@ -143,6 +146,7 @@
var/locid = 0
var/laststart = 1
var/textindex = 1
playsound(src, 'sound/items/handling/writing.ogg', 50, 1, -1)
while(locid < 15) //hey whoever decided a while(1) was a good idea here, i hate you
var/istart = 0
if(links)
+1 -2
View File
@@ -238,7 +238,6 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
hitsound = 'sound/weapons/circsawhit.ogg'
throwhitsound = 'sound/weapons/pierce.ogg'
item_flags = SURGICAL_TOOL
flags_1 = CONDUCT_1
force = 15
@@ -251,6 +250,7 @@
sharpness = IS_SHARP
tool_behaviour = TOOL_SAW
toolspeed = 1
mob_throw_hit_sound = 'sound/weapons/pierce.ogg'
/obj/item/circular_saw/Initialize()
. = ..()
@@ -263,7 +263,6 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "saw"
hitsound = 'sound/weapons/circsawhit.ogg'
throwhitsound = 'sound/weapons/pierce.ogg'
flags_1 = CONDUCT_1
force = 10
w_class = WEIGHT_CLASS_SMALL
+3
View File
@@ -129,6 +129,9 @@
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,
/obj/item/clothing/head/ushanka = 3,
/obj/item/clothing/suit/gcvest = 2,
/obj/item/clothing/suit/gcvest/alt = 2,
/obj/item/clothing/gloves/guncaster = 4,
/obj/item/clothing/under/soviet = 3,
/obj/item/storage/belt/fannypack/black = 3,
/obj/item/clothing/suit/jacket/letterman_syndie = 5,
+1
View File
@@ -0,0 +1 @@
GLOBAL_LIST_EMPTY(wendigo_soul_storages)
@@ -0,0 +1,277 @@
/*
Holds things like antag datums, game modes, abilities, and everything
related to the antag that could be a datum
*/
//ANTAGONIST
/datum/antagonist/wendigo
name = "wendigo"
antagpanel_category = "Wendigo"
/datum/antagonist/wendigo/on_gain()
if(istype(owner.current, /mob/living/carbon/human))
var/mob/living/carbon/wendigo/new_owner = new/mob/living/carbon/wendigo(get_turf(owner.current))
var/mob/current_body = owner.current
current_body.transfer_ckey(new_owner)
current_body.Destroy()
owner = new_owner.mind
owner.current = new_owner
..()
//HUD
//Contents: Intentions, Hands, Dropping/Throwing/Pulling, Inventory Equip
// Health + Souls on the bottom of screen
//TODO: Health doll, Soul counter (not devil)
/datum/hud/wendigo/New(mob/living/carbon/wendigo/owner)
..()
var/obj/screen/using
var/obj/screen/inventory/inv_box
var/widescreenlayout = FALSE //adds support for different hud layouts depending on widescreen pref
if(owner.client && owner.client.prefs && owner.client.prefs.widescreenpref)
widescreenlayout = FALSE
//CRAFTING
using = new /obj/screen/craft
using.icon = ui_style
if(!widescreenlayout)
using.screen_loc = ui_boxcraft
static_inventory += using
//LANG MENU
using = new/obj/screen/language_menu
using.icon = ui_style
if(!widescreenlayout)
using.screen_loc = ui_boxlang
static_inventory += using
//AREA EDITOR
using = new /obj/screen/area_creator
using.icon = ui_style
if(!widescreenlayout)
using.screen_loc = ui_boxarea
static_inventory += using
using = new /obj/screen/voretoggle()
using.icon = tg_ui_icon_to_cit_ui(ui_style)
using.screen_loc = ui_voremode
if(!widescreenlayout)
using.screen_loc = ui_boxvore
static_inventory += using
//INTENTS & ACTIONS
action_intent = new /obj/screen/act_intent/segmented
action_intent.icon_state = mymob.a_intent
static_inventory += action_intent
using = new /obj/screen/human/equip()
using.icon = ui_style
using.screen_loc = ui_equip_position(mymob)
static_inventory += using
using = new /obj/screen/mov_intent
using.icon = tg_ui_icon_to_cit_ui(ui_style)
using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking")
using.screen_loc = ui_movi
static_inventory += using
using = new /obj/screen/resist()
using.icon = ui_style
using.screen_loc = ui_overridden_resist
hotkeybuttons += using
using = new /obj/screen/restbutton()
using.icon = tg_ui_icon_to_cit_ui(ui_style)
using.screen_loc = ui_pull_resist
static_inventory += using
using = new /obj/screen/combattoggle()
using.icon = tg_ui_icon_to_cit_ui(ui_style)
using.screen_loc = ui_combat_toggle
static_inventory += using
using = new /obj/screen/drop()
using.icon = ui_style
using.screen_loc = ui_drop_throw
static_inventory += using
pull_icon = new /obj/screen/pull()
pull_icon.icon = ui_style
pull_icon.update_icon(mymob)
pull_icon.screen_loc = ui_pull_resist
static_inventory += pull_icon
throw_icon = new /obj/screen/throw_catch()
throw_icon.icon = ui_style
throw_icon.screen_loc = ui_drop_throw
hotkeybuttons += throw_icon
//////
//INVENTORY
//////
build_hand_slots()
using = new /obj/screen/human/toggle()
using.icon = ui_style
using.screen_loc = ui_inventory
static_inventory += using
using = new /obj/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_1"
using.screen_loc = ui_swaphand_position(owner,1)
static_inventory += using
using = new /obj/screen/swap_hand()
using.icon = ui_style
using.icon_state = "swap_2"
using.screen_loc = ui_swaphand_position(owner,2)
static_inventory += using
inv_box = new /obj/screen/inventory()
inv_box.name = "neck"
inv_box.icon = ui_style
inv_box.icon_state = "neck"
inv_box.screen_loc = ui_neck
inv_box.slot_id = SLOT_NECK
toggleable_inventory += inv_box
inv_box = new /obj/screen/inventory()
inv_box.name = "back"
inv_box.icon = ui_style
inv_box.icon_state = "back"
inv_box.screen_loc = ui_back
inv_box.slot_id = SLOT_BACK
static_inventory += inv_box
inv_box = new /obj/screen/inventory()
inv_box.name = "gloves"
inv_box.icon = ui_style
inv_box.icon_state = "gloves"
inv_box.screen_loc = ui_gloves
inv_box.slot_id = SLOT_GLOVES
toggleable_inventory += inv_box
inv_box = new /obj/screen/inventory()
inv_box.name = "eyes"
inv_box.icon = ui_style
inv_box.icon_state = "glasses"
inv_box.screen_loc = ui_glasses
inv_box.slot_id = SLOT_GLASSES
toggleable_inventory += inv_box
inv_box = new /obj/screen/inventory()
inv_box.name = "ears"
inv_box.icon = ui_style
inv_box.icon_state = "ears"
inv_box.screen_loc = ui_ears
inv_box.slot_id = SLOT_EARS
toggleable_inventory += inv_box
inv_box = new /obj/screen/inventory()
inv_box.name = "head"
inv_box.icon = ui_style
inv_box.icon_state = "head"
inv_box.screen_loc = ui_head
inv_box.slot_id = SLOT_HEAD
toggleable_inventory += inv_box
inv_box = new /obj/screen/inventory()
inv_box.name = "belt"
inv_box.icon = ui_style
inv_box.icon_state = "belt"
inv_box.screen_loc = ui_belt
inv_box.slot_id = SLOT_BELT
static_inventory += inv_box
//INFO DISPLAY
internals = new /obj/screen/internals()
infodisplay += internals
healths = new /obj/screen/healths()
infodisplay += healths
healthdoll = new /obj/screen/healthdoll()
infodisplay += healthdoll
zone_select = new /obj/screen/zone_sel()
zone_select.icon = ui_style
zone_select.update_icon(mymob)
static_inventory += zone_select
for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory))
if(inv.slot_id)
inv.hud = src
inv_slots[inv.slot_id] = inv
inv.update_icon()
/datum/hud/wendigo/hidden_inventory_update(mob/viewer)
if(!mymob)
return
var/mob/living/carbon/wendigo/W = mymob
var/mob/screenmob = viewer || W
if(screenmob.hud_used.inventory_shown && screenmob.hud_used.hud_shown)
if(W.gloves)
W.gloves.screen_loc = ui_gloves
screenmob.client.screen += W.gloves
if(W.ears)
W.ears.screen_loc = ui_ears
screenmob.client.screen += W.ears
if(W.glasses)
W.glasses.screen_loc = ui_glasses
screenmob.client.screen += W.glasses
if(W.wear_neck)
W.wear_neck.screen_loc = ui_neck
screenmob.client.screen += W.wear_neck
if(W.head)
W.head.screen_loc = ui_head
screenmob.client.screen += W.head
else
if(W.gloves) screenmob.client.screen -= W.gloves
if(W.ears) screenmob.client.screen -= W.ears
if(W.glasses) screenmob.client.screen -= W.glasses
if(W.wear_neck) screenmob.client.screen -= W.wear_neck
if(W.head) screenmob.client.screen -= W.head
/datum/hud/wendigo/persistent_inventory_update(mob/viewer)
if(!mymob)
return
..()
var/mob/living/carbon/wendigo/W = mymob
var/mob/screenmob = viewer || W
if(screenmob.hud_used)
if(screenmob.hud_used.hud_shown)
if(W.belt)
W.belt.screen_loc = ui_belt
screenmob.client.screen += W.belt
if(W.back)
W.back.screen_loc = ui_back
screenmob.client.screen += W.back
else
if(W.belt)
screenmob.client.screen -= W.belt
if(W.back)
screenmob.client.screen -= W.back
if(hud_version != HUD_STYLE_NOHUD)
for(var/obj/item/I in W.held_items)
I.screen_loc = ui_hand_position(W.get_held_index_of_item(I))
screenmob.client.screen += I
else
for(var/obj/item/I in W.held_items)
I.screen_loc = null
screenmob.client.screen -= I
/datum/hud/wendigo/show_hud(version = 0,mob/viewmob)
. = ..()
if(!.)
return
var/mob/screenmob = viewmob || mymob
hidden_inventory_update(screenmob)
@@ -0,0 +1,14 @@
/obj/structure/soul_storage
name = "soul storage"
desc = "Stores souls!"
var/list/souls = list()
//This is a big WIP. I don't even want it having the name "soul storage" but it'll do for now
/obj/structure/soul_storage/Initialize()
. = ..()
GLOB.wendigo_soul_storages += src
/obj/structure/soul_storage/Destroy()
GLOB.wendigo_soul_storages -= src
return ..()
@@ -0,0 +1,11 @@
/mob/living/carbon/wendigo/UnarmedAttack(atom/A, proximity)
A.attack_hand(src)
/mob/living/carbon/wendigo/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
if(incapacitated() || lying)
to_chat(src, "<span class='warning'>You can't do that right now!</span>")
return FALSE
if(be_close && !in_range(M, src))
to_chat(src, "<span class='warning'>You are too far away!</span>")
return FALSE
return TRUE
@@ -0,0 +1,115 @@
#define DEFAULT_MOVESPEED 1.5
//The mob itself
/mob/living/carbon/wendigo
name = "wendigo"
gender = FEMALE
unique_name = FALSE
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPLOYAL_HUD,IMPCHEM_HUD,IMPTRACK_HUD, NANITE_HUD, DIAG_NANITE_FULL_HUD,ANTAG_HUD,GLAND_HUD,SENTIENT_DISEASE_HUD)
hud_type = /datum/hud/wendigo
possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
appearance_flags = TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
status_flags = CANSTUN //cant be knocked down, unconscious, or be pushed
maxHealth = 200
icon = 'hyperstation/icons/mobs/wendigo.dmi'
icon_state = "reference"
bodyparts = list(/obj/item/bodypart/chest/wendigo, /obj/item/bodypart/head/wendigo,
/obj/item/bodypart/l_arm/wendigo, /obj/item/bodypart/r_arm/wendigo,
/obj/item/bodypart/l_leg/wendigo, /obj/item/bodypart/r_leg/wendigo)
var/obj/item/belt = null
var/datum/physiology/physiology
var/obj/structure/soul_storage/connected_link
var/fake_breast_size = 5 //She doesn't actually have the organ, but we cache her breast size for rp reasons
var/fake_penis_size = 8
/mob/living/carbon/wendigo/Initialize()
. = ..()
/* //TODO: Uncomment when objectives + forest get finished
if(!connected_link)
if(!GLOB.wendigo_soul_storages.len)
connected_link = new /obj/structure/soul_storage(get_turf(src))
else
connected_link = pick(GLOB.wendigo_soul_storages)
gender = pick(FEMALE, MALE)
*/
if(gender == MALE)
fake_breast_size = 0
else
fake_penis_size = 0
real_name = name
//DAMAGE RESISTANCE
physiology = new()
physiology.brute_mod = 0.7
physiology.burn_mod = 1.25
physiology.tox_mod = -1
physiology.oxy_mod = 1
physiology.clone_mod = 0
physiology.stamina_mod = 0 //Running and attacking, prods
physiology.heat_mod = 2 //IM MELTIIINNNGGGG-!
physiology.cold_mod = 0
physiology.siemens_coeff = 0.2
physiology.stun_mod = 0 //prods n aggressive grab
//physiology.bleed_mod = 2
physiology.speed_mod = 0.9 //Should be faster than a normal person's walking speed
physiology.hunger_mod = 2 //We're gonna have a FEAST TONIGHT!
physiology.do_after_speed = 1
//Traits & Bodyparts
create_bodyparts()
create_internal_organs()
ADD_TRAIT(src, TRAIT_NOCLONE, "initialize")
add_verb(src, /mob/living/proc/mob_sleep)
add_verb(src, /mob/living/proc/lay_down)
add_movespeed_modifier("MOVESPEED_DEFAULT", multiplicative_slowdown=DEFAULT_MOVESPEED)
update_body_parts()
/mob/living/carbon/wendigo/Destroy()
QDEL_NULL(physiology)
return ..()
/mob/living/carbon/wendigo/update_body_parts()
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
BP.update_limb()
/mob/living/carbon/wendigo/update_move_intent_slowdown()
var/mod = 0
if(m_intent == MOVE_INTENT_WALK)
mod = (CONFIG_GET(number/movedelay/walk_delay) / 2) //complete copy besides this part
else
mod = 1.30
if(!isnum(mod))
mod = 1
add_movespeed_modifier(MOVESPEED_ID_MOB_WALK_RUN_CONFIG_SPEED, TRUE, 100, override = TRUE, multiplicative_slowdown = mod)
/mob/living/carbon/wendigo/update_movespeed(resort=TRUE)
return (..() * physiology.speed_mod)
/mob/living/carbon/wendigo/can_hold_items()
return TRUE
/mob/living/carbon/wendigo/IsAdvancedToolUser()
return TRUE
/mob/living/carbon/wendigo/can_be_pulled()
return FALSE
/mob/living/carbon/wendigo/is_literate()
return TRUE
/mob/living/carbon/wendigo/canBeHandcuffed()
return TRUE
/mob/living/carbon/wendigo/update_inv_handcuffed()
return
/mob/living/carbon/wendigo/update_inv_legcuffed()
return
//
//ORGANS
//
/mob/living/carbon/wendigo/create_internal_organs()
internal_organs += new /obj/item/organ/eyes/wendigo
internal_organs += new /obj/item/organ/liver/wendigo
internal_organs += new /obj/item/organ/tongue
internal_organs += new /obj/item/organ/lungs
internal_organs += new /obj/item/organ/heart
internal_organs += new /obj/item/organ/stomach
internal_organs += new /obj/item/organ/ears
..()
@@ -0,0 +1,86 @@
/mob/living/carbon/wendigo/examine(mob/user)
var/t_He = p_they(TRUE)
var/t_His = p_their(TRUE)
var/t_his = p_their()
var/t_him = p_them()
. = list("<span class='info'>*---------*\nThis is [icon2html(src, user)] \a <EM>[src]</EM>!")
if(handcuffed)
. += "<span class='warning'>[t_He] is [icon2html(handcuffed, user)] handcuffed!</span>"
if(legcuffed)
. += "<span class='warning'>[t_He] has [icon2html(legcuffed, user)] leg cuffs!</span>"
if(head)
. += "[t_He] is wearing [head.get_examine_string(user)] on [t_his] head."
if(wear_neck)
. += "[t_He] is wearing [wear_neck.get_examine_string(user)] around [t_his] neck."
for(var/obj/item/I in held_items)
if(!(I.item_flags & ABSTRACT))
. += "[t_He] is holding [I.get_examine_string(user)] in [t_his] [get_held_index_name(get_held_index_of_item(I))]."
if(back)
. += "[t_He] has [back.get_examine_string(user)] on [t_his] back."
if(stat == DEAD)
. += "<span class='deadsay'>[t_He] is limp and unresponsive, with no signs of life.</span>"
var/list/msg = ("<span class='warning'>")
var/temp_hp = getBruteLoss()
if(!(user == src && src.hal_screwyhud == SCREWYHUD_HEALTHY))
if(temp_hp)
if(temp_hp <= 25) msg += "[t_He] has minor bruising.\n"
else if(temp_hp <= 75) msg += "[t_He] has <B>moderate</B> bruising!\n"
else msg += "<B>[t_He] has severe bruising!</B>\n"
temp_hp = getFireLoss()
if(temp_hp)
if(temp_hp <= 25) msg += "[t_He] has minor burns.\n"
else if(temp_hp <= 50) msg += "[t_He] has <B>moderate</B> burns!\n"
else msg += "<B>[t_He] has severe burns!</B>\n"
if(fire_stacks > 0)
msg += "[t_He] is covered in something flammable.\n"
if(fire_stacks < 0)
msg += "[t_He] looks a little soaked.\n"
if(pulledby)
if(pulledby.grab_state)
msg += "[t_He] is restrained by [pulledby]'s grip.\n"
msg += "</span>"
. += msg
if(stat == UNCONSCIOUS)
. += "[t_He] isn't responding to anything around [t_him] and seems to be asleep."
else if(InCritical())
. += "[t_His] breathing is shallow and labored."
if(fake_breast_size < 16)
. += "You see a pair of breasts. You estimate them to be [ascii2text(round(fake_breast_size)+63)]-cups."
else if(!fake_breast_size && gender == FEMALE)
. += "You see a pair of breasts. They're small and flatchested, however."
else
. += "You see [pick("some serious honkers", "a real set of badonkers", "some dobonhonkeros", "massive dohoonkabhankoloos", "two big old tonhongerekoogers", "a couple of giant bonkhonagahoogs", "a pair of humongous hungolomghnonoloughongous")]. Their volume is way beyond cupsize now, measuring in about [round(fake_breast_size)]cm in diameter."
if(fake_penis_size)
. += "You see a flaccid human penis. You estimate it's about [round(fake_penis_size, 0.25)] inch[round(fake_penis_size, 0.25) != 1 ? "es" : ""] long." //would put girth here but lazy
if(connected_link)
if(connected_link.souls.len > 5)
. += "<span class='warning'><B>[t_His] eyes are glowing a deadly red.</B></span>"
else
var/A = "<span class='deadsay'>"
switch(connected_link.souls.len)
if(0)
A += "[t_He] looks malnourished and weak."
if(1)
A += "[t_He] looks hungry."
if(2 to 4)
A += "[t_He] is salivating."
if(5)
A += "[t_His] eyes are glowing red."
. += "[A]</span>"
else
. += "<span class='deadsay'>[t_He] looks lost.</span>"
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, .)
. += "*---------*</span>"
@@ -0,0 +1,55 @@
//Snowflake metabolization with naughty organ manipulation
/mob/living/carbon/wendigo/proc/metabolize_hunger()
if(HAS_TRAIT(src, TRAIT_NOHUNGER))
return
if(connected_link)
if(connected_link.souls.len > 3)
nutrition = min(800, nutrition + (HUNGER_FACTOR*connected_link.souls.len))
nutrition = max(0, nutrition - (HUNGER_FACTOR / (physiology.hunger_mod / (connected_link.souls.len + 1))))
else
nutrition = max(0, nutrition - (HUNGER_FACTOR / physiology.hunger_mod))
switch(nutrition)
if(NUTRITION_LEVEL_FULL to INFINITY)
throw_alert("nutrition", /obj/screen/alert/fat)
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_FULL)
clear_alert("nutrition")
if(NUTRITION_LEVEL_HUNGRY to NUTRITION_LEVEL_STARVING)
throw_alert("nutrition", /obj/screen/alert/hungry)
if(0 to NUTRITION_LEVEL_STARVING)
throw_alert("nutrition", /obj/screen/alert/starving)
/mob/living/carbon/wendigo/reagent_check(datum/reagent/R)
if(istype(R, /datum/reagent/fermi))
var/had_changed = FALSE
if(R.type == /datum/reagent/fermi/penis_enlarger)
fake_penis_size += 0.25
had_changed = "penis_enlarger"
if(R.type == /datum/reagent/fermi/PEsmaller)
fake_penis_size = max(0, fake_penis_size - 0.25)
had_changed = "PEsmaller"
if(R.type == /datum/reagent/fermi/breast_enlarger)
fake_breast_size += 0.25
had_changed = "breast_enlarger"
if(R.type == /datum/reagent/fermi/BEsmaller)
fake_breast_size = max(0, fake_breast_size - 0.25)
had_changed = "BEsmaller"
if(had_changed)
R.volume -= R.metabolization_rate
if(round(fake_penis_size, 1) == fake_penis_size && fake_penis_size)
switch(had_changed)
if("penis_enlarger")
to_chat(src, "<span class='warning'>Your [pick(GLOB.gentlemans_organ_names)] [pick("swells up to", "flourishes into", "expands into", "bursts forth into", "grows eagerly into", "amplifys into")] a [fake_penis_size] inch penis.</b></span>")
if("PEsmaller")
if(fake_penis_size > 0)
to_chat(src, "<span class='warning'>Your [pick(GLOB.gentlemans_organ_names)] [pick("shrinks down to", "decreases into", "diminishes into", "deflates into", "shrivels regretfully into", "contracts into")] a [fake_penis_size] inch penis.</b></span>")
else if(round(fake_breast_size, 1) == fake_breast_size && fake_breast_size)
switch(had_changed)
if("breast_enlarger")
to_chat(src, "<span class='warning'>Your breasts [pick("swell up to", "flourish into", "expand into", "burst forth into", "grow eagerly into", "amplify into")] a [ascii2text(round(fake_breast_size)+63)]-cup.</b></span>")
if("BEsmaller)")
if(fake_breast_size > 0)
to_chat(src, "<span class='warning'>Your breasts [pick("shrink down to", "decrease into", "diminish into", "deflate into", "shrivel regretfully into", "contracts into")] a [ascii2text(round(fake_breast_size)+63)]-cup.</b></span>")
return TRUE
@@ -0,0 +1,125 @@
/mob/living/carbon/wendigo/handle_environment(datum/gas_mixture/environment)
if(!environment)
return
var/loc_temp = get_temperature(environment)
if(stat != DEAD)
adjust_bodytemperature(natural_bodytemperature_stabilization())
if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
if(loc_temp < bodytemperature)
adjust_bodytemperature(max((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR, BODYTEMP_COOLING_MAX))
else
adjust_bodytemperature(min((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX))
if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTHEAT))
switch(bodytemperature)
if(280 to 300)
throw_alert("temp", /obj/screen/alert/hot, 1)
apply_damage(HEAT_DAMAGE_LEVEL_1*physiology.heat_mod, BURN)
if(300 to 350)
throw_alert("temp", /obj/screen/alert/hot, 2)
apply_damage(HEAT_DAMAGE_LEVEL_2*physiology.heat_mod, BURN)
if(350 to INFINITY)
throw_alert("temp", /obj/screen/alert/hot, 3)
if(on_fire)
apply_damage(HEAT_DAMAGE_LEVEL_3*physiology.heat_mod, BURN)
else
apply_damage(HEAT_DAMAGE_LEVEL_2*physiology.heat_mod, BURN)
else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT && !HAS_TRAIT(src, TRAIT_RESISTCOLD))
if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
switch(bodytemperature)
if(200 to 260)
throw_alert("temp", /obj/screen/alert/cold, 1)
apply_damage(COLD_DAMAGE_LEVEL_1*physiology.cold_mod, BURN)
if(0 to 120)
throw_alert("temp", /obj/screen/alert/cold, 2)
apply_damage(COLD_DAMAGE_LEVEL_2*physiology.cold_mod, BURN)
if(-INFINITY to 0)
throw_alert("temp", /obj/screen/alert/cold, 3)
apply_damage(COLD_DAMAGE_LEVEL_3*physiology.cold_mod, BURN)
else
clear_alert("temp")
else
clear_alert("temp")
//Account for massive pressure differences
var/pressure = environment.return_pressure()
var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
switch(adjusted_pressure)
if(HAZARD_HIGH_PRESSURE to INFINITY)
adjustBruteLoss(min((((adjusted_pressure / HAZARD_HIGH_PRESSURE)-1)*PRESSURE_DAMAGE_COEFFICIENT)*physiology.pressure_mod, MAX_HIGH_PRESSURE_DAMAGE))
throw_alert("pressure", /obj/screen/alert/highpressure, 2)
if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
throw_alert("pressure", /obj/screen/alert/highpressure, 1)
if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
clear_alert("pressure")
if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
else
adjustBruteLoss( LOW_PRESSURE_DAMAGE*physiology.pressure_mod )
throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
return
/mob/living/carbon/wendigo/handle_breath_temperature(datum/gas_mixture/breath)
if(abs(BODYTEMP_NORMAL - breath.temperature) > 50)
switch(breath.temperature)
if(-INFINITY to 0)
adjustFireLoss(3)
if(0 to 120) //We flourish in a cold environment
adjustFireLoss(1.5)
if(298 to 350) //But hoo boy do we not like the heat
adjustFireLoss(2)
if(350 to 800)
adjustFireLoss(3)
if(800 to INFINITY)
adjustFireLoss(8)
/mob/living/carbon/wendigo/handle_fire()
if(..())
return
adjust_bodytemperature(BODYTEMP_HEATING_MAX*physiology.heat_mod)
return
/mob/living/carbon/wendigo/adjustBruteLoss(amount, updating_health, forced)
return ..(amount*physiology.brute_mod, updating_health, forced)
/mob/living/carbon/wendigo/adjustFireLoss(amount, updating_health, forced)
return ..(amount*physiology.burn_mod, updating_health, forced)
/mob/living/carbon/wendigo/adjustToxLoss(amount, updating_health, forced)
return ..(amount*physiology.tox_mod, updating_health, forced)
/mob/living/carbon/wendigo/adjustOxyLoss(amount, updating_health, forced)
return ..(amount*physiology.oxy_mod, updating_health, forced)
/mob/living/carbon/wendigo/adjustCloneLoss(amount, updating_health, forced)
return ..(amount*physiology.clone_mod, updating_health, forced)
/mob/living/carbon/wendigo/adjustStaminaLoss(amount, updating_health, forced)
return ..(amount*physiology.stamina_mod, updating_health, forced)
/mob/living/carbon/wendigo/do_after_coefficent()
. = ..()
. *= physiology.do_after_speed
/mob/living/carbon/wendigo/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, override = 0, tesla_shock = 0, illusion = 0, stun = TRUE)
return ..(shock_damage, source, physiology.siemens_coeff, safety, override, tesla_shock, illusion, stun)
/mob/living/carbon/wendigo/Stun(amount, updating, ignore_canstun)
return ..(amount*physiology.stun_mod, updating, ignore_canstun)
/mob/living/carbon/wendigo/Knockdown(amount, updating, ignore_canknockdown, override_hardstun, override_stamdmg)
return ..(amount*physiology.stun_mod, updating, ignore_canknockdown, override_hardstun, override_stamdmg)
/mob/living/carbon/wendigo/Unconscious(amount, updating, ignore_canunconscious)
return ..(amount*physiology.stun_mod, updating, ignore_canunconscious)
/mob/living/carbon/wendigo/bleed(amt)
return ..(amt*physiology.bleed_mod)
@@ -0,0 +1,100 @@
/mob/living/carbon/wendigo/can_equip(obj/item/I, slot, disable_warning)
switch(slot)
if(SLOT_HANDS)
if(get_empty_held_indexes())
return TRUE
return FALSE
if(SLOT_GLASSES)
if(glasses)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_EYES))
return FALSE
return TRUE
if(SLOT_NECK)
if(wear_neck)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_NECK))
return FALSE
return TRUE
if(SLOT_EARS)
if(ears)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_EARS))
return FALSE
return TRUE
if(SLOT_GLOVES)
if(gloves)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_GLOVES))
return FALSE
return TRUE
if(SLOT_BACK)
if(back)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_BACK))
return FALSE
return TRUE
if(SLOT_IN_BACKPACK)
if(back)
if(SEND_SIGNAL(back, COMSIG_TRY_STORAGE_CAN_INSERT, I, src, TRUE))
return TRUE
return FALSE
if(SLOT_HEAD)
if(head)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_HEAD))
return FALSE
return TRUE
if(SLOT_BELT)
if(belt)
return FALSE
if(!(I.slot_flags & ITEM_SLOT_BELT))
return FALSE
return TRUE
return FALSE
/mob/living/carbon/wendigo/equip_to_slot(obj/item/I, slot)
if(!..())
return
switch(slot)
if(SLOT_GLASSES)
glasses = I
update_inv_glasses()
if(SLOT_EARS)
ears = I
update_inv_ears()
if(SLOT_GLOVES)
gloves = I
update_inv_gloves()
return TRUE
/mob/living/carbon/wendigo/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE)
. = ..()
if(!. || !I)
return
else if(I == gloves)
gloves = null
if(!QDELETED(src))
update_inv_gloves()
else if(I == glasses)
glasses = null
var/obj/item/clothing/glasses/G = I
if(G.tint)
update_tint()
if(G.vision_correction)
if(HAS_TRAIT(src, TRAIT_NEARSIGHT))
overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
adjust_eye_damage(0)
if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view || !isnull(G.lighting_alpha))
update_sight()
if(!QDELETED(src))
update_inv_glasses()
else if(I == ears)
ears = null
if(!QDELETED(src))
update_inv_ears()
else if(I == belt)
belt = null
if(!QDELETED(src))
update_inv_belt()
@@ -0,0 +1,58 @@
/obj/item/organ/liver/wendigo
name = "rotten liver"
desc = "A liver from a wendigo. It looks like a spoiled tomato."
decay_factor = 0
/obj/item/organ/liver/wendigo/on_life()
var/mob/living/carbon/C = owner
if(istype(C))
damage = initial(maxHealth)
if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
//handle liver toxin filtration
for(var/datum/reagent/toxin/T in C.reagents.reagent_list)
var/thisamount = C.reagents.get_reagent_amount(T.type)
if (thisamount && thisamount <= toxTolerance)
C.reagents.remove_reagent(T.type, 1)
C.reagents.metabolize(C, can_overdose=FALSE)
if(istype(C, /mob/living/carbon/wendigo))
var/mob/living/carbon/wendigo/A = C
A.metabolize_hunger()
/obj/item/organ/eyes/wendigo
sight_flags = SEE_MOBS
/obj/item/bodypart/head/wendigo
dismemberable = FALSE
max_damage = INFINITY
animal_origin = WENDIGO_BODYPART
/obj/item/bodypart/chest/wendigo
dismemberable = FALSE
max_damage = INFINITY
animal_origin = WENDIGO_BODYPART
/obj/item/bodypart/l_arm/wendigo
dismemberable = FALSE
max_damage = INFINITY
attack_verb = list("slashed", "clawed", "mauled")
animal_origin = WENDIGO_BODYPART
/obj/item/bodypart/r_arm/wendigo
dismemberable = FALSE
max_damage = INFINITY
attack_verb = list("slashed", "clawed", "mauled")
animal_origin = WENDIGO_BODYPART
/obj/item/bodypart/l_leg/wendigo
dismemberable = FALSE
max_damage = INFINITY
attack_verb = list("pounded", "stomped", "stamped", "kicked")
animal_origin = WENDIGO_BODYPART
/obj/item/bodypart/r_leg/wendigo
dismemberable = FALSE
max_damage = INFINITY
attack_verb = list("pounded", "stomped", "stamped", "kicked")
animal_origin = WENDIGO_BODYPART
@@ -0,0 +1,370 @@
#define HEAD_X_OFFSET_NORTH 2
#define HEAD_Y_OFFSET_NORTH 8
#define HEAD_X_OFFSET_EAST 2
#define HEAD_Y_OFFSET_EAST 8
#define HEAD_X_OFFSET_SOUTH 8
#define HEAD_Y_OFFSET_SOUTH 2
#define HEAD_X_OFFSET_WEST 8
#define HEAD_Y_OFFSET_WEST -2
#define LHAND_X_OFFSET_NORTH -5
#define LHAND_Y_OFFSET_NORTH 3
#define LHAND_X_OFFSET_EAST -2
#define LHAND_Y_OFFSET_EAST 3
#define LHAND_X_OFFSET_SOUTH 8
#define LHAND_Y_OFFSET_SOUTH 3
#define LHAND_X_OFFSET_WEST -2
#define LHAND_Y_OFFSET_WEST 3
#define RHAND_X_OFFSET_NORTH 8
#define RHAND_Y_OFFSET_NORTH 3
#define RHAND_X_OFFSET_EAST 2
#define RHAND_Y_OFFSET_EAST 3
#define RHAND_X_OFFSET_SOUTH -5
#define RHAND_Y_OFFSET_SOUTH 3
#define RHAND_X_OFFSET_WEST 2
#define RHAND_Y_OFFSET_WEST 3
#define EARS_X_OFFSET_NORTH 0
#define EARS_Y_OFFSET_NORTH 0
#define EARS_X_OFFSET_EAST 0
#define EARS_Y_OFFSET_EAST 0
#define EARS_X_OFFSET_SOUTH 0
#define EARS_Y_OFFSET_SOUTH 0
#define EARS_X_OFFSET_WEST 0
#define EARS_Y_OFFSET_WEST 0
#define GLASSES_X_OFFSET_NORTH 5
#define GLASSES_Y_OFFSET_NORTH 10
#define GLASSES_X_OFFSET_EAST 1
#define GLASSES_Y_OFFSET_EAST 10
#define GLASSES_X_OFFSET_SOUTH -2
#define GLASSES_Y_OFFSET_SOUTH 10
#define GLASSES_X_OFFSET_WEST -1
#define GLASSES_Y_OFFSET_WEST 10
#define BELT_X_OFFSET_NORTH 0
#define BELT_Y_OFFSET_NORTH 10
#define BELT_X_OFFSET_EAST 0
#define BELT_Y_OFFSET_EAST 0
#define BELT_X_OFFSET_SOUTH 0
#define BELT_Y_OFFSET_SOUTH 0
#define BELT_X_OFFSET_WEST 0
#define BELT_Y_OFFSET_WEST 0
#define BACK_X_OFFSET_NORTH 1
#define BACK_Y_OFFSET_NORTH 8
#define BACK_X_OFFSET_EAST 0
#define BACK_Y_OFFSET_EAST 8
#define BACK_X_OFFSET_SOUTH 1
#define BACK_Y_OFFSET_SOUTH 8
#define BACK_X_OFFSET_WEST 0
#define BACK_Y_OFFSET_WEST 8
#define NECK_X_OFFSET_NORTH 2
#define NECK_Y_OFFSET_NORTH 10
#define NECK_X_OFFSET_EAST 0
#define NECK_Y_OFFSET_EAST 10
#define NECK_X_OFFSET_SOUTH 2
#define NECK_Y_OFFSET_SOUTH 10
#define NECK_X_OFFSET_WEST 0
#define NECK_Y_OFFSET_WEST 10
/mob/living/carbon/wendigo/setDir(newdir, ismousemovement)
if(dir == newdir)
return //Don't spend time regenerating icons when we don't move
. = ..()
regenerate_icons()
/mob/living/carbon/wendigo/regenerate_icons()
if(!..())
update_inv_head()
update_inv_gloves()
update_inv_ears()
update_inv_glasses()
update_inv_belt()
update_inv_back()
update_inv_neck()
update_transform()
/mob/living/carbon/wendigo/update_inv_gloves()
if(gloves)
gloves.screen_loc = ui_gloves
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += gloves
//GLASSES
/mob/living/carbon/wendigo/update_inv_glasses()
if(glasses)
glasses.screen_loc = ui_glasses
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += glasses
//EARS
/mob/living/carbon/wendigo/update_inv_ears()
remove_overlay(EARS_LAYER)
if(ears)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_EARS]
inv.update_icon()
ears.screen_loc = ui_ears //move the item to the appropriate screen loc
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += ears
overlays_standing[EARS_LAYER] = ears.build_worn_icon(state = ears.icon_state, default_layer = EARS_LAYER, default_icon_file = ((ears.alternate_worn_icon) ? ears.alternate_worn_icon : 'icons/mob/ears.dmi'))
var/mutable_appearance/ears_overlay = overlays_standing[EARS_LAYER]
switch(dir)
if(NORTH)
ears_overlay.pixel_x += EARS_X_OFFSET_NORTH
ears_overlay.pixel_y += EARS_Y_OFFSET_NORTH
if(EAST)
ears_overlay.pixel_x += EARS_X_OFFSET_EAST
ears_overlay.pixel_y += EARS_Y_OFFSET_EAST
if(SOUTH)
ears_overlay.pixel_x += EARS_X_OFFSET_SOUTH
ears_overlay.pixel_y += EARS_Y_OFFSET_SOUTH
if(WEST)
ears_overlay.pixel_x += EARS_X_OFFSET_WEST
ears_overlay.pixel_y += EARS_Y_OFFSET_WEST
overlays_standing[EARS_LAYER] = ears_overlay
apply_overlay(EARS_LAYER)
//BELT
/mob/living/carbon/wendigo/update_inv_belt()
remove_overlay(BELT_LAYER)
if(belt)
belt.screen_loc = ui_belt
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += belt
var/t_state = belt.item_state
if(!t_state)
t_state = belt.icon_state
overlays_standing[BELT_LAYER] = belt.build_worn_icon(state = t_state, default_layer = BELT_LAYER, default_icon_file = ((belt.alternate_worn_icon) ? belt.alternate_worn_icon : 'icons/mob/belt.dmi'))
var/mutable_appearance/belt_overlay = overlays_standing[BELT_LAYER]
switch(dir)
if(NORTH)
belt_overlay.pixel_x += BELT_X_OFFSET_NORTH
belt_overlay.pixel_y += BELT_Y_OFFSET_NORTH
if(EAST)
belt_overlay.pixel_x += BELT_X_OFFSET_EAST
belt_overlay.pixel_y += BELT_Y_OFFSET_EAST
if(SOUTH)
belt_overlay.pixel_x += BELT_X_OFFSET_SOUTH
belt_overlay.pixel_y += BELT_Y_OFFSET_SOUTH
if(WEST)
belt_overlay.pixel_x += BELT_X_OFFSET_WEST
belt_overlay.pixel_y += BELT_Y_OFFSET_WEST
overlays_standing[BELT_LAYER] = belt_overlay
apply_overlay(BELT_LAYER)
//BACK
/mob/living/carbon/wendigo/update_inv_back()
..()
if(back)
back.screen_loc = ui_back
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += back
var/mutable_appearance/back_overlay = overlays_standing[BACK_LAYER]
if(back_overlay)
remove_overlay(BACK_LAYER)
switch(dir)
if(NORTH)
back_overlay.pixel_x += BACK_X_OFFSET_NORTH
back_overlay.pixel_y += BACK_Y_OFFSET_NORTH
if(EAST)
back_overlay.pixel_x += BACK_X_OFFSET_EAST
back_overlay.pixel_y += BACK_Y_OFFSET_EAST
if(SOUTH)
back_overlay.pixel_x += BACK_X_OFFSET_SOUTH
back_overlay.pixel_y += BACK_Y_OFFSET_SOUTH
if(WEST)
back_overlay.pixel_x += BACK_X_OFFSET_WEST
back_overlay.pixel_y += BACK_Y_OFFSET_WEST
overlays_standing[BACK_LAYER] = back_overlay
apply_overlay(BACK_LAYER)
//NECK
/mob/living/carbon/wendigo/update_inv_neck()
..()
if(wear_neck)
wear_neck.screen_loc = ui_neck
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += wear_neck
var/mutable_appearance/neck_overlay = overlays_standing[NECK_LAYER]
if(neck_overlay)
remove_overlay(NECK_LAYER)
switch(dir)
if(NORTH)
neck_overlay.pixel_x += NECK_X_OFFSET_NORTH
neck_overlay.pixel_y += NECK_Y_OFFSET_NORTH
if(EAST)
neck_overlay.pixel_x += NECK_X_OFFSET_EAST
neck_overlay.pixel_y += NECK_Y_OFFSET_EAST
if(SOUTH)
neck_overlay.pixel_x += NECK_X_OFFSET_SOUTH
neck_overlay.pixel_y += NECK_Y_OFFSET_SOUTH
if(WEST)
neck_overlay.pixel_x += NECK_X_OFFSET_WEST
neck_overlay.pixel_y += NECK_Y_OFFSET_WEST
overlays_standing[NECK_LAYER] = neck_overlay
apply_overlay(NECK_LAYER)
//HANDS
/mob/living/carbon/wendigo/update_inv_hands()
remove_overlay(HANDS_LAYER)
if (handcuffed)
drop_all_held_items()
return
var/list/hands = list()
for(var/obj/item/I in held_items)
if(client && hud_used && hud_used.hud_version != HUD_STYLE_NOHUD)
I.screen_loc = ui_hand_position(get_held_index_of_item(I))
client.screen += I
if(observers && observers.len)
for(var/M in observers)
var/mob/dead/observe = M
if(observe.client && observe.client.eye == src)
observe.client.screen += I
else
observers -= observe
if(!observers.len)
observers = null
break
var/t_state = I.item_state
if(!t_state)
t_state = I.icon_state
var/icon_file = I.lefthand_file
var/righthand = 0
if(get_held_index_of_item(I) % 2 == 0)
icon_file = I.righthand_file
righthand = 1
var/mutable_appearance/thing = I.build_worn_icon(state = t_state, default_layer = HANDS_LAYER, default_icon_file = icon_file, isinhands = TRUE)
if(righthand)
switch(dir)
if(NORTH)
thing.pixel_x += RHAND_X_OFFSET_NORTH
thing.pixel_y += RHAND_Y_OFFSET_NORTH
if(EAST)
thing = null //ghetto
if(SOUTH)
thing.pixel_x += RHAND_X_OFFSET_SOUTH
thing.pixel_y += RHAND_Y_OFFSET_SOUTH
if(WEST)
thing.pixel_x += RHAND_X_OFFSET_WEST
thing.pixel_y += RHAND_Y_OFFSET_WEST
else
switch(dir)
if(NORTH)
thing.pixel_x += LHAND_X_OFFSET_NORTH
thing.pixel_y += LHAND_Y_OFFSET_NORTH
if(EAST)
thing.pixel_x += LHAND_X_OFFSET_EAST
thing.pixel_y += LHAND_Y_OFFSET_EAST
if(SOUTH)
thing.pixel_x += LHAND_X_OFFSET_SOUTH
thing.pixel_y += LHAND_Y_OFFSET_SOUTH
if(WEST)
thing = null //ghetto
hands += thing
overlays_standing[HANDS_LAYER] = hands
apply_overlay(HANDS_LAYER)
//HEAD
/mob/living/carbon/wendigo/update_inv_head()
remove_overlay(HEAD_LAYER)
if(head)
head.screen_loc = ui_head
if(client && hud_used && hud_used.hud_shown)
if(hud_used.inventory_shown)
client.screen += head
var/mutable_appearance/head_icon = head.build_worn_icon(state = head.icon_state, default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/head.dmi')
switch(dir)
if(NORTH)
head_icon.pixel_x += HEAD_X_OFFSET_NORTH
head_icon.pixel_y += HEAD_Y_OFFSET_NORTH
if(EAST)
head_icon.pixel_x += HEAD_X_OFFSET_EAST
head_icon.pixel_y += HEAD_Y_OFFSET_EAST
if(SOUTH)
head_icon.pixel_x += HEAD_X_OFFSET_SOUTH
head_icon.pixel_y += HEAD_Y_OFFSET_SOUTH
if(WEST)
head_icon.pixel_x += HEAD_X_OFFSET_WEST
head_icon.pixel_y += HEAD_Y_OFFSET_WEST
overlays_standing[SLOT_HEAD] = head_icon
update_hud_head(head)
apply_overlay(HEAD_LAYER)
#undef LHAND_X_OFFSET_NORTH
#undef LHAND_Y_OFFSET_NORTH
#undef LHAND_X_OFFSET_EAST
#undef LHAND_Y_OFFSET_EAST
#undef LHAND_X_OFFSET_SOUTH
#undef LHAND_Y_OFFSET_SOUTH
#undef LHAND_X_OFFSET_WEST
#undef LHAND_Y_OFFSET_WEST
#undef RHAND_X_OFFSET_NORTH
#undef RHAND_Y_OFFSET_NORTH
#undef RHAND_X_OFFSET_EAST
#undef RHAND_Y_OFFSET_EAST
#undef RHAND_X_OFFSET_SOUTH
#undef RHAND_Y_OFFSET_SOUTH
#undef RHAND_X_OFFSET_WEST
#undef RHAND_Y_OFFSET_WEST
#undef EARS_X_OFFSET_NORTH
#undef EARS_Y_OFFSET_NORTH
#undef EARS_X_OFFSET_EAST
#undef EARS_Y_OFFSET_EAST
#undef EARS_X_OFFSET_SOUTH
#undef EARS_Y_OFFSET_SOUTH
#undef EARS_X_OFFSET_WEST
#undef EARS_Y_OFFSET_WEST
#undef GLASSES_X_OFFSET_NORTH
#undef GLASSES_Y_OFFSET_NORTH
#undef GLASSES_X_OFFSET_EAST
#undef GLASSES_Y_OFFSET_EAST
#undef GLASSES_X_OFFSET_SOUTH
#undef GLASSES_Y_OFFSET_SOUTH
#undef GLASSES_X_OFFSET_WEST
#undef GLASSES_Y_OFFSET_WEST
#undef BELT_X_OFFSET_NORTH
#undef BELT_Y_OFFSET_NORTH
#undef BELT_X_OFFSET_EAST
#undef BELT_Y_OFFSET_EAST
#undef BELT_X_OFFSET_SOUTH
#undef BELT_Y_OFFSET_SOUTH
#undef BELT_X_OFFSET_WEST
#undef BELT_Y_OFFSET_WEST
#undef BACK_X_OFFSET_NORTH
#undef BACK_Y_OFFSET_NORTH
#undef BACK_X_OFFSET_EAST
#undef BACK_Y_OFFSET_EAST
#undef BACK_X_OFFSET_SOUTH
#undef BACK_Y_OFFSET_SOUTH
#undef BACK_X_OFFSET_WEST
#undef BACK_Y_OFFSET_WEST
#undef NECK_X_OFFSET_NORTH
#undef NECK_Y_OFFSET_NORTH
#undef NECK_X_OFFSET_EAST
#undef NECK_Y_OFFSET_EAST
#undef NECK_X_OFFSET_SOUTH
#undef NECK_Y_OFFSET_SOUTH
#undef NECK_X_OFFSET_WEST
#undef NECK_Y_OFFSET_WEST
@@ -0,0 +1,13 @@
/obj/item/clothing/gloves/guncaster
name = "fingerless leather gloves"
desc = "Sturdy leather gloves with no fingertips, buckled at the wrist."
icon_state = "guncaster"
item_state = "guncaster"
icon = 'hyperstation/icons/obj/clothing/gloves.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/gloves.dmi'
item_color = null //So they don't wash.
transfer_prints = TRUE
strip_delay = 40
equip_delay_other = 20
cold_protection = HANDS
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
@@ -7,3 +7,18 @@
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/gcvest
name = "\improper Guncaster's Vest"
desc = "An open leather vest with battlescarred metal shoulderpads, perfect for hunting interdimensional wazards. Smells of gunpowder and plasma."
icon_state = "guncaster"
item_state = "guncaster"
icon = 'hyperstation/icons/obj/clothing/suits.dmi'
alternate_worn_icon = 'hyperstation/icons/mobs/suits.dmi'
mutantrace_variation = NO_MUTANTRACE_VARIATION
/obj/item/clothing/suit/gcvest/alt
name = "\improper Hellraider's Vest"
desc = "An open leather vest with battlescarred metal shoulderpads, discovered in a dimensional anomaly. Smells of gunpowder and plasma."
icon_state = "guncaster_alt"
item_state = "guncaster_alt"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 501 B

After

Width:  |  Height:  |  Size: 894 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 552 B

After

Width:  |  Height:  |  Size: 777 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 719 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 289 B

After

Width:  |  Height:  |  Size: 435 B

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 326 KiB

After

Width:  |  Height:  |  Size: 326 KiB

@@ -3,6 +3,11 @@
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/fingerless
/datum/gear/gcgloves
name = "Fingerless Leather Gloves"
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/guncaster
/datum/gear/goldring
name = "A gold ring"
category = SLOT_GLOVES
@@ -19,4 +24,4 @@
name = "A diamond ring"
category = SLOT_GLOVES
path = /obj/item/clothing/gloves/ring/diamond
cost = 4
cost = 4
@@ -120,6 +120,17 @@
path = /obj/item/clothing/suit/flakjack
cost = 2
/datum/gear/gcvest
name = "Guncaster's Vest"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/gcvest
/datum/gear/gcvestalt
name = "Hellraider's Vest"
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/gcvest/alt
/datum/gear/trekds9_coat
name = "DS9 Overcoat (use uniform)"
category = SLOT_WEAR_SUIT
@@ -32,6 +32,8 @@
/datum/reagent/fermi/breast_enlarger/on_mob_add(mob/living/carbon/M)
. = ..()
if(iswendigo(M))
return
if(!ishuman(M)) //The monkey clause
if(volume >= 15) //To prevent monkey breast farms
var/turf/T = get_turf(M)
@@ -164,6 +166,8 @@
/datum/reagent/fermi/BEsmaller_hypo/on_mob_add(mob/living/carbon/M)
. = ..()
if(iswendigo(M))
return
if(!M.getorganslot("vagina"))
if(M.dna.features["has_vag"])
var/obj/item/organ/genital/vagina/nV = new
@@ -208,6 +212,8 @@
/datum/reagent/fermi/penis_enlarger/on_mob_add(mob/living/carbon/M)
. = ..()
if(iswendigo(M))
return
if(!ishuman(M)) //Just monkeying around.
if(volume >= 15) //to prevent monkey penis farms
var/turf/T = get_turf(M)
@@ -351,6 +357,8 @@
/datum/reagent/fermi/PEsmaller_hypo/on_mob_add(mob/living/carbon/M)
. = ..()
if(iswendigo(M))
return
if(!M.getorganslot("testicles"))
if(M.dna.features["has_balls"])
var/obj/item/organ/genital/testicles/nT = new
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More