Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into hide-boots-
Browse files Browse the repository at this point in the history
  • Loading branch information
Dorodomki committed Dec 17, 2024
2 parents 96122b6 + 81774e3 commit 962fd70
Show file tree
Hide file tree
Showing 58 changed files with 1,086 additions and 2,239 deletions.
31 changes: 22 additions & 9 deletions _maps/map_files/stonehamlet/stonehamlet.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2452,6 +2452,9 @@
/obj/structure/bars/pipe{
dir = 1
},
/obj/machinery/light/rogue/wallfire/candle/l{
pixel_y = 28
},
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"cyt" = (
Expand Down Expand Up @@ -5608,7 +5611,7 @@
"fvn" = (
/obj/structure/mineral_door/bars{
locked = 1;
lockid = "lord"
lockid = "manor"
},
/obj/effect/decal/shadow_floor{
dir = 1
Expand Down Expand Up @@ -5767,6 +5770,7 @@
/obj/effect/decal/shadow_floor{
dir = 1
},
/obj/machinery/light/rogue/wallfire/candle,
/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"fGl" = (
Expand Down Expand Up @@ -6794,9 +6798,12 @@
"gHu" = (
/obj/structure/table/wood/plain_alt,
/obj/item/rogueweapon/shovel{
pixel_x = 6;
pixel_x = 11;
pixel_y = 1
},
/obj/item/rogueweapon/axe/iron{
pixel_x = -12
},
/turf/open/floor/rogue/cobblerock_alt,
/area/rogue/indoors/town)
"gHE" = (
Expand Down Expand Up @@ -7348,6 +7355,7 @@
/obj/item/reagent_containers/food/snacks/produce/jacksberry/poison,
/obj/item/reagent_containers/glass/bottle/rogue/poison,
/obj/structure/closet/crate/chest/neu_fancy,
/obj/item/paper/nitemaiden_certificate,
/turf/open/floor/carpet/royalblack,
/area/rogue/indoors/town/bath/redhouse)
"hsL" = (
Expand Down Expand Up @@ -7788,10 +7796,6 @@
/area/rogue/indoors/town/manor{
first_time_text = "STONEHILL CASTLE"
})
"hOu" = (
/obj/machinery/light/rogue/wallfire/candle/weak/l,
/turf/open/floor/rogue/tile/bath,
/area/rogue/indoors/town/bath/redhouse)
"hOx" = (
/obj/effect/decal/shadow_floor{
dir = 8
Expand Down Expand Up @@ -7879,6 +7883,7 @@
/obj/effect/decal/shadow_floor{
dir = 6
},
/obj/machinery/light/rogue/wallfire/candle/l,
/turf/open/floor/rogue/blocks/stonered/tiny,
/area/rogue/indoors/town/bath/redhouse)
"hQV" = (
Expand Down Expand Up @@ -8072,6 +8077,7 @@
/obj/item/clothing/suit/roguetown/shirt/tunic/random,
/obj/item/clothing/suit/roguetown/shirt/tunic/random,
/obj/item/clothing/suit/roguetown/shirt/dress/gen/sexy,
/obj/item/paper/nitemaiden_certificate,
/turf/open/floor/rogue/wood/saiga,
/area/rogue/under/town/basement)
"icG" = (
Expand Down Expand Up @@ -12760,6 +12766,7 @@
/area/rogue/outdoors/rtfield/plague_district)
"mNM" = (
/obj/structure/mineral_door/wood{
lockid = "manor";
name = "servants quarters"
},
/turf/open/floor/rogue/cobble,
Expand Down Expand Up @@ -12808,7 +12815,6 @@
/obj/item/reagent_containers/food/snacks/produce/dry_westleach,
/obj/item/reagent_containers/food/snacks/produce/dry_westleach,
/obj/item/reagent_containers/food/snacks/produce/dry_westleach,
/obj/machinery/light/rogue/wallfire/candle/weak/r,
/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"mPQ" = (
Expand Down Expand Up @@ -15597,7 +15603,6 @@
/turf/open/floor/rogue/ruinedwood/spiral,
/area/rogue/indoors/town/church)
"pov" = (
/obj/machinery/light/rogue/wallfire/candle/weak,
/obj/effect/decal/shadow_floor{
dir = 1
},
Expand Down Expand Up @@ -20594,6 +20599,7 @@
/obj/structure/closet/crate/drawer/random{
pixel_y = 7
},
/obj/item/paper/nitemaiden_certificate,
/turf/open/floor/rogue/woodturned/saiga,
/area/rogue/under/town/basement)
"uoh" = (
Expand Down Expand Up @@ -22040,6 +22046,10 @@
/obj/structure/table/wood/large/corner_blue{
dir = 10
},
/obj/item/candle/yellow/lit/infinite{
pixel_x = 17;
pixel_y = 11
},
/turf/open/floor/rogue/herringbone,
/area/rogue/indoors/town/bath/redhouse)
"vCr" = (
Expand Down Expand Up @@ -23162,6 +23172,9 @@
/obj/item/reagent_containers/powder/ozium,
/obj/item/reagent_containers/powder/spice,
/obj/effect/decal/shadow_floor,
/obj/machinery/light/rogue/wallfire/candle{
pixel_y = -30
},
/turf/open/floor/rogue/ruinedwood/chevron,
/area/rogue/indoors/town/bath/redhouse)
"wLo" = (
Expand Down Expand Up @@ -65805,7 +65818,7 @@ tsI
kuA
sFL
dDV
hOu
sFL
cya
tcZ
fIp
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,5 @@
#define WOUND_SEVERITY_CRITICAL 4
/// Wounds that are almost immediately fatal, such as a dissected aorta
#define WOUND_SEVERITY_FATAL 5
/// This wound has werewolf infection
#define WOUND_SEVERITY_BIOHAZARD 6
40 changes: 20 additions & 20 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -391,15 +391,16 @@
//skin tones defines

//DWARF SKIN TONES
#define SKIN_COLOR_PLATINUM "ffe0d1"
#define SKIN_COLOR_AURUM "fcccb3"
#define SKIN_COLOR_QUICKSILVER "edc6b3"
#define SKIN_COLOR_BRASS "e2b9a3"
#define SKIN_COLOR_IRON "d9a284"
#define SKIN_COLOR_MALACHITE "c69b83"
#define SKIN_COLOR_OBSIDIAN "3b2e27"
#define SKIN_COLOR_BRIMSTONE "271f1a"
#define SKIN_COLOR_CERARGYRITE "74708b"
#define SKIN_COLOR_ARGENT "f9d5c3"
#define SKIN_COLOR_AURUM "fcdab3"
#define SKIN_COLOR_MERCUR "edc6b3"
#define SKIN_COLOR_BRASS "dfb798"
#define SKIN_COLOR_FERRO "d9a284"
#define SKIN_COLOR_PHOSPHORITE "967e70"
#define SKIN_COLOR_OBSIDIAN "59403b"
#define SKIN_COLOR_PYRITE "54545d"
#define SKIN_COLOR_QUARTZ "8b7e70"
#define SKIN_COLOR_GRENZDWARF "ffe0d1"

//DARK ELF SKIN TONES
#define SKIN_COLOR_MAGGOT "9796a9"
Expand All @@ -421,17 +422,16 @@
#define SKIN_COLOR_SAND_ELF "5d4c41"

//HUMEN SKIN TONES
#define SKIN_COLOR_ICECAP "fff0e9"
#define SKIN_COLOR_ARCTIC "ffe0d1"
#define SKIN_COLOR_TUNDRA "fcccb3"
#define SKIN_COLOR_CONTINENTAL "edc6b3"
#define SKIN_COLOR_TEMPERATE "e2b9a3"
#define SKIN_COLOR_COASTAL "d9a284"
#define SKIN_COLOR_SUBTROPICAL "c9a893"
#define SKIN_COLOR_TROPICALDRY "ba9882"
#define SKIN_COLOR_TROPICALWET "ac8369"
#define SKIN_COLOR_DESERT "9c6f52"
#define SKIN_COLOR_CRIMSONLANDS "4e3729"
#define SKIN_COLOR_GRENZELHOFT "ffe0d1"
#define SKIN_COLOR_LOWLANDER "fcccb3"
#define SKIN_COLOR_MAINLANDER "edc6b3"
#define SKIN_COLOR_HEARTFELT "e2b9a3"
#define SKIN_COLOR_VALORIAN "d9a284"
#define SKIN_COLOR_STEPPE "c9a893"
#define SKIN_COLOR_ISLANDER "ba9882"
#define SKIN_COLOR_SOUTHLANDER "ac8369"
#define SKIN_COLOR_ZYBANTU "9c6f52"
#define SKIN_COLOR_CRIMSONLANDS "684e3d"

//AASIMAR SKIN TONES
#define SKIN_COLOR_PLANETAR "ffd859"
Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/hud/ghost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
// Store the current time for the player
GLOB.job_respawn_delays[G.ckey] = world.time + target_job.same_job_respawn_delay

verbs -= /client/proc/descend
for(var/turf/spawn_loc in GLOB.underworldcoinspawns)
var/mob/living/carbon/spirit/O = new /mob/living/carbon/spirit(spawn_loc)
O.livingname = G.name
O.ckey = G.ckey
SSdroning.area_entered(get_area(O), O.client)
verbs -= /client/proc/descend
return

// var/take_triumph = FALSE
Expand All @@ -70,12 +70,12 @@
if(C.skeletons)
G.returntolobby()
if(alert("Travel with the boatman?", "", "Yes", "No") == "Yes")
verbs -= /client/proc/descend
for(var/turf/spawn_loc in GLOB.underworldcoinspawns)
var/mob/living/carbon/spirit/O = new /mob/living/carbon/spirit(spawn_loc)
O.livingname = G.name
O.ckey = G.ckey
SSdroning.area_entered(get_area(O), O.client)
verbs -= /client/proc/descend
/* if(world.time < G.ghostize_time + RESPAWNTIME)
var/ttime = round((G.ghostize_time + RESPAWNTIME - world.time) / 10)
var/list/thingsz = list("My connection to the world is still too strong.",\
Expand Down
56 changes: 46 additions & 10 deletions code/_onclick/item_attack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
*/
/obj/item/proc/melee_attack_chain(mob/user, atom/target, params)
if(user.check_arm_grabbed(user.active_hand_index))
to_chat(user, "<span class='notice'>I can't move my arm!</span>")
to_chat(user, span_notice("I can't move my arm!"))
return
if(!user.has_hand_for_held_index(user.active_hand_index, TRUE)) //we obviously have a hadn, but we need to check for fingers/prosthetics
to_chat(user, "<span class='warning'>I can't move the fingers.</span>")
to_chat(user, span_warning("I can't move the fingers."))
return
if(!istype(src, /obj/item/grabbing))
if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS))
to_chat(user, "<span class='warning'>...What?</span>")
to_chat(user, span_warning("...What?"))
return
if(tool_behaviour && target.tool_act(user, src, tool_behaviour))
return
Expand Down Expand Up @@ -80,7 +80,7 @@
return FALSE

if(force && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "<span class='warning'>I don't want to harm other living beings!</span>")
to_chat(user, span_warning("I don't want to harm other living beings!"))
return

M.lastattacker = user.real_name
Expand Down Expand Up @@ -363,12 +363,12 @@
verbu = pick(user.used_intent.attack_verb)
if(newforce > 1)
if(user.rogfat_add(5))
user.visible_message("<span class='danger'>[user] [verbu] [src] with [I]!</span>")
user.visible_message(span_danger("[user] [verbu] [src] with [I]!"))
else
user.visible_message("<span class='warning'>[user] [verbu] [src] with [I]!</span>")
user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))
newforce = 1
else
user.visible_message("<span class='warning'>[user] [verbu] [src] with [I]!</span>")
user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))
take_damage(newforce, I.damtype, "melee", 1)
if(newforce > 1)
I.take_damage(1, BRUTE, "melee")
Expand All @@ -390,12 +390,12 @@
verbu = pick(user.used_intent.attack_verb)
if(newforce > 1)
if(user.rogfat_add(5))
user.visible_message("<span class='danger'>[user] [verbu] [src] with [I]!</span>")
user.visible_message(span_danger("[user] [verbu] [src] with [I]!"))
else
user.visible_message("<span class='warning'>[user] [verbu] [src] with [I]!</span>")
user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))
newforce = 1
else
user.visible_message("<span class='warning'>[user] [verbu] [src] with [I]!</span>")
user.visible_message(span_warning("[user] [verbu] [src] with [I]!"))

take_damage(newforce, I.damtype, "melee", 1)
if(newforce > 1)
Expand Down Expand Up @@ -451,6 +451,42 @@
return "body"

/obj/item/proc/funny_attack_effects(mob/living/target, mob/living/user, nodmg)
if(is_silver)
if(world.time < src.last_used + 120)
to_chat(user, span_notice("The silver effect is on cooldown."))
return

if(ishuman(target) && target.mind)
var/mob/living/carbon/human/s_user = user
var/mob/living/carbon/human/H = target
var/datum/antagonist/werewolf/W = H.mind.has_antag_datum(/datum/antagonist/werewolf/)
var/datum/antagonist/vampirelord/lesser/V = H.mind.has_antag_datum(/datum/antagonist/vampirelord/lesser)
var/datum/antagonist/vampirelord/V_lord = H.mind.has_antag_datum(/datum/antagonist/vampirelord/)
if(V)
if(V.disguised)
H.visible_message("<font color='white'>The silver weapon weakens the curse temporarily!</font>")
to_chat(H, span_userdanger("I'm hit by my BANE!"))
H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
src.last_used = world.time
else
H.visible_message("<font color='white'>The silver weapon weakens the curse temporarily!</font>")
to_chat(H, span_userdanger("I'm hit by my BANE!"))
H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
src.last_used = world.time
if(V_lord)
if(V_lord.vamplevel < 4 && !V)
H.visible_message("<font color='white'>The silver weapon weakens the curse temporarily!</font>")
to_chat(H, span_userdanger("I'm hit by my BANE!"))
H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
src.last_used = world.time
if(V_lord.vamplevel == 4 && !V)
to_chat(s_user, "<font color='red'> The silver weapon fails!</font>")
H.visible_message(H, span_userdanger("This feeble metal can't hurt me, I AM ANCIENT!"))
if(W && W.transformed == TRUE)
H.visible_message("<font color='white'>The silver weapon weakens the curse temporarily!</font>")
to_chat(H, span_userdanger("I'm hit by my BANE!"))
H.apply_status_effect(/datum/status_effect/debuff/silver_curse)
src.last_used = world.time
return

/mob/living/attacked_by(obj/item/I, mob/living/user)
Expand Down
12 changes: 8 additions & 4 deletions code/_onclick/other_mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,19 @@

next_attack_msg.Cut()

var/datum/wound/caused_wound
if(!nodmg)
caused_wound = affecting.bodypart_attacked_by(BCLASS_BITE, dam2do, user, user.zone_selected, crit_message = TRUE)

if(!nodmg)
playsound(src, "smallslash", 100, TRUE, -1)
if(istype(src, /mob/living/carbon/human))
var/mob/living/carbon/human/H = src
if(user.mind && mind)
if(user.mind.has_antag_datum(/datum/antagonist/werewolf))
if(!src.mind.has_antag_datum(/datum/antagonist/werewolf))
if(prob(10))
addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, werewolf_infect)), 3 MINUTES)
if(istype(user.dna.species, /datum/species/werewolf))
caused_wound?.werewolf_infect_attempt()
if(prob(30))
user.werewolf_feed(src)
if(user.mind.has_antag_datum(/datum/antagonist/zombie) && !src.mind.has_antag_datum(/datum/antagonist/zombie))
INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon/human, zombie_infect_attempt))

Expand Down
9 changes: 3 additions & 6 deletions code/datums/status_effects/rogue/debuff.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,14 @@
/datum/status_effect/debuff/silver_curse
id = "silver_curse"
alert_type = /atom/movable/screen/alert/status_effect/debuff/silver_curse
duration = 5 SECONDS
/* Pointless subtype, code doesnt handle it well, dont use
/datum/status_effect/debuff/silver_curse/greater
duration = 10 SECONDS
*/
effectedstats = list("strength" = -2,"perception" = -2,"intelligence" = -2, "constitution" = -2, "endurance" = -2,"speed" = -2)
duration = 45 SECONDS

/atom/movable/screen/alert/status_effect/debuff/silver_curse
name = "Silver Curse"
desc = "My BANE!"
icon_state = "hunger3"


// PINTLEDESTRUCTION

/datum/status_effect/debuff/pintledestruction
Expand Down
Loading

0 comments on commit 962fd70

Please sign in to comment.