cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-21 12:05:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unlucky trait (#18463)

Browse Source 
* this compiles

* more edits

* Upports OP21's immovable rod

Makes it NOT shit.

* actually enable this lol

* CLANG

* we all fall down

* break it

* stairs

* bye async

* makes doorcrushes less lethal

* more unluck!

* dice and stumble vore

* major version

* Update clang.dm

* More tweaks. BS Cracker

Makes bluespace cracker better code quality too

* Cut down on lists here

* Adds the traits

* glass shapnel

* Update unlucky.dm

* Modular Shock

* Charger and thrown

* Defib nat 1

* Gravity Falls

* gibby

* no longer gib, just hurt a LOT

* Better Washer

* Update washing_machine.dm

* Even less jank

* Moves some stuff around

* linters

* Update unlucky.dm

* Table stubbing

* fixes mirror break, evil only

* PIPEBOMB

* Update negative.dm

* Update mail.dm

* glasses fly off your face if you fall

* Update unlucky.dm

* evil beaker and spooky events in the dark

* Evil beaker spilling

* Unlucky people have custom maint loot

* Get sick while searching

* Update _lootable.dm

* whoop

* Update _lootable.dm

* washer will always wash

* Lowered to 5

* ash

* Update areas.dm

* get knocked

* picking up items

* Dice

* Update unlucky.dm

* Update code/game/objects/items/devices/defib.dm

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>

* Update code/modules/economy/vending.dm

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>

* Update code/game/area/areas.dm

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>

* Update code/datums/components/traits/unlucky.dm

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>

* Update code/datums/components/traits/unlucky.dm

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>

* Update code/datums/components/traits/unlucky.dm

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>

* Update code/datums/components/traits/unlucky.dm

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>

* Nicer damage

* these

* this

* mini DCS update

* Excludes

* Proper inherit

* Update unlucky.dm

* Update code/datums/components/traits/unlucky.dm

* These

* thes too

* user

* no hardrefs

* only these 2

---------

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
Cameron Lennox
2025-10-04 03:13:12 -04:00
committed by GitHub
parent 0befda8668
commit 7f4de78573
44 changed files with 1123 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/defib.dm
+5 -1
View File
@@ -389,6 +389,10 @@
return
H.apply_damage(burn_damage_amt, BURN, BP_TORSO)
if(HAS_TRAIT(H, TRAIT_UNLUCKY) && prob(5))
make_announcement("buzzes, \"Unknown error occurred. Please try again.\"", "warning")
playsound(src, 'sound/machines/defib_failed.ogg', 50, FALSE)
return
//set oxyloss so that the patient is just barely in crit, if possible
var/barely_in_crit = H.get_crit_point() - 1
@@ -437,7 +441,7 @@
playsound(src, 'sound/weapons/egloves.ogg', 100, 1, -1)
set_cooldown(cooldowntime)
H.stun_effect_act(2, 120, target_zone)
H.stun_effect_act(2, 120, target_zone, electric = TRUE)
var/burn_damage = H.electrocute_act(burn_damage_amt*2, src, def_zone = target_zone)
if(burn_damage > 15 && H.can_feel_pain())
H.emote("scream")
code/game/objects/items/weapons/grenades/flashbang.dm
+7
View File
@@ -159,3 +159,10 @@
walk_away(src,temploc,stepdist)
addtimer(CALLBACK(src, PROC_REF(detonate)), rand(15, 60), TIMER_DELETE_ME)
/obj/item/grenade/flashbang/clusterbang/primed
desc = "This clusterbang seems to have already been activated. Uhoh."
/obj/item/grenade/flashbang/clusterbang/primed/Initialize(mapload)
. = ..()
activate()
code/game/objects/items/weapons/grenades/smokebomb.dm
+7
View File
@@ -37,3 +37,10 @@
var/new_smoke_color = tgui_color_picker(user, "Choose a color for the smoke:", "Smoke Color", smoke_color)
if(new_smoke_color)
smoke_color = new_smoke_color
/obj/item/grenade/smokebomb/primed
desc = "A smoke bomb. This one appears to be already activated!"
/obj/item/grenade/smokebomb/primed/Initialize(mapload)
. = ..()
activate()
code/game/objects/items/weapons/stunbaton.dm
+1 -1
View File
@@ -205,7 +205,7 @@
//stun effects
if(status)
target.stun_effect_act(stun, agony, hit_zone, src)
target.stun_effect_act(stun, agony, hit_zone, src, electric = TRUE)
msg_admin_attack("[key_name(user)] stunned [key_name(target)] with the [src].")
if(ishuman(target))