Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modsuits. In 2027. #11340

Open
wants to merge 214 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
0bd7799
https://github.com/tgstation/tgstation/pull/49844
Tsar-Salat Dec 27, 2023
966bf1a
https://github.com/tgstation/tgstation/pull/53140
Tsar-Salat Dec 27, 2023
0ef8a73
https://github.com/tgstation/tgstation/pull/55371
Tsar-Salat Dec 27, 2023
945c9ce
https://github.com/tgstation/tgstation/pull/58029
Tsar-Salat Dec 28, 2023
b7fb61d
https://github.com/tgstation/tgstation/pull/58812
Tsar-Salat Dec 28, 2023
e350ba3
https://github.com/tgstation/tgstation/pull/71369
Tsar-Salat Dec 28, 2023
63b7424
fix ratvar shit
Tsar-Salat Dec 28, 2023
6e02d01
fixers
Tsar-Salat Dec 28, 2023
1dcedde
tweaks
Tsar-Salat May 21, 2024
0e57219
bad var
Tsar-Salat May 21, 2024
7aff751
obj_break
Tsar-Salat Aug 2, 2024
d747ee6
WIP on modsuits-take5
Tsar-Salat Aug 6, 2024
8f27e71
515
Tsar-Salat Aug 11, 2024
cba6e18
fixes modsuit icons
Tsar-Salat Aug 11, 2024
8da5261
wound to bleed
Tsar-Salat Aug 11, 2024
0cb4574
reorganize icons
Tsar-Salat Aug 11, 2024
f2774b5
plating and circuit fix
Tsar-Salat Aug 11, 2024
a3c957f
oops
Tsar-Salat Aug 11, 2024
dafadba
plating cleanup & map
Tsar-Salat Aug 11, 2024
5483a89
patch 1
Tsar-Salat Aug 17, 2024
c1fe2eb
515 and icons
Tsar-Salat Aug 17, 2024
1af2d92
speed potions
Tsar-Salat Aug 17, 2024
0a8e722
emp fix
Tsar-Salat Aug 17, 2024
7023f16
pin modules
Tsar-Salat Aug 17, 2024
7f65990
modsuit balance
Tsar-Salat Aug 17, 2024
eb736f5
maintenance
Tsar-Salat Aug 17, 2024
7e36232
dna scanner
Tsar-Salat Aug 17, 2024
9898d3a
anomalock
Tsar-Salat Aug 17, 2024
ee663aa
prox
Tsar-Salat Aug 17, 2024
7061973
Merge branch 'proximitymonitorrefactor' into modsuits-take5
Tsar-Salat Aug 17, 2024
73dcf0c
Time peeps
Tsar-Salat Aug 18, 2024
8c19660
clown paint
Tsar-Salat Aug 18, 2024
1a030d9
modular cores
Tsar-Salat Aug 18, 2024
78bd928
wound to bleed
Tsar-Salat Aug 18, 2024
535fbde
515 and fix tests
Tsar-Salat Aug 18, 2024
bcc1902
kinesis rework
Tsar-Salat Aug 18, 2024
8850a4d
fix issues with nodrop
Tsar-Salat Aug 18, 2024
a31e57b
paper
Tsar-Salat Aug 18, 2024
6386955
loader
Tsar-Salat Aug 18, 2024
8c8da77
https://github.com/tgstation/tgstation/pull/64668
Tsar-Salat Aug 18, 2024
8b097fb
https://github.com/tgstation/tgstation/pull/64674
Tsar-Salat Aug 18, 2024
4cc9057
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Aug 22, 2024
2dea4a4
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Aug 25, 2024
c3cab73
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Aug 25, 2024
a0e6158
mining
Tsar-Salat Aug 28, 2024
99b75bd
Merge branch 'modsuits-take5' of https://github.com/Tsar-Salat/BeeSta…
Tsar-Salat Aug 28, 2024
a3ae6e3
linters
Tsar-Salat Aug 29, 2024
9bdd176
https://github.com/tgstation/tgstation/pull/64709
Tsar-Salat Aug 29, 2024
b3d0c10
https://github.com/tgstation/tgstation/pull/64857
Tsar-Salat Aug 29, 2024
4a3d3c5
https://github.com/tgstation/tgstation/pull/64934
Tsar-Salat Aug 29, 2024
94bb613
515
Tsar-Salat Aug 29, 2024
cf2e92b
https://github.com/tgstation/tgstation/pull/65000
Tsar-Salat Aug 29, 2024
f5726f9
https://github.com/tgstation/tgstation/pull/65193
Tsar-Salat Aug 29, 2024
fcf7293
https://github.com/tgstation/tgstation/pull/65416
Tsar-Salat Aug 29, 2024
9c7d5f8
https://github.com/tgstation/tgstation/pull/65559
Tsar-Salat Aug 29, 2024
354b0e7
https://github.com/tgstation/tgstation/pull/65915
Tsar-Salat Aug 29, 2024
78531b8
https://github.com/tgstation/tgstation/pull/65445
Tsar-Salat Aug 29, 2024
6c64b16
https://github.com/tgstation/tgstation/pull/65733
Tsar-Salat Aug 29, 2024
07c9292
https://github.com/tgstation/tgstation/pull/66087
Tsar-Salat Aug 29, 2024
7dfd292
https://github.com/tgstation/tgstation/pull/65753
Tsar-Salat Aug 29, 2024
55138e9
https://github.com/tgstation/tgstation/pull/61138 https://github.com/…
Tsar-Salat Aug 29, 2024
7c21a43
https://github.com/tgstation/tgstation/pull/63755
Tsar-Salat Aug 29, 2024
332df49
https://github.com/tgstation/tgstation/pull/66170
Tsar-Salat Aug 29, 2024
37b15cc
https://github.com/tgstation/tgstation/pull/66190
Tsar-Salat Aug 29, 2024
d717f96
https://github.com/tgstation/tgstation/pull/66196
Tsar-Salat Aug 29, 2024
f056f35
https://github.com/tgstation/tgstation/pull/66208
Tsar-Salat Aug 29, 2024
7f609c1
techweb
Tsar-Salat Aug 30, 2024
cf70673
prettier
Tsar-Salat Aug 30, 2024
42033c6
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Sep 8, 2024
bc35b4b
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Sep 12, 2024
39e52ec
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Sep 28, 2024
c7634f0
Merge branch 'master' into modsuits-take5
Tsar-Salat Oct 3, 2024
3cb5352
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Oct 13, 2024
ab8b84b
compiler errors
Tsar-Salat Oct 13, 2024
5d412e1
fix conflicts
Tsar-Salat Oct 15, 2024
3536e5d
declarations
Tsar-Salat Oct 15, 2024
aec62ea
defines
Tsar-Salat Oct 16, 2024
75c1acd
.dme
Tsar-Salat Oct 16, 2024
736c8d0
more .dme
Tsar-Salat Oct 17, 2024
3c06371
fix unittest
Tsar-Salat Oct 17, 2024
ec3cdaf
tick unit test
Tsar-Salat Oct 17, 2024
4b9a423
try this
Tsar-Salat Oct 17, 2024
93a036a
try an early return instead
Tsar-Salat Oct 17, 2024
3477146
run list length
Tsar-Salat Oct 17, 2024
81c997f
oops
Tsar-Salat Oct 17, 2024
7b39a83
deeper we go
Tsar-Salat Oct 17, 2024
0217563
this is valid, supposedly
Tsar-Salat Oct 17, 2024
a0d71c9
losing my mind
Tsar-Salat Oct 17, 2024
f5da3e8
need to check something
Tsar-Salat Oct 17, 2024
20eef80
syndie box
Tsar-Salat Oct 17, 2024
7570a0b
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Oct 19, 2024
4f7c0cf
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Oct 31, 2024
e5e3106
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Nov 9, 2024
d156b22
name
Tsar-Salat Nov 9, 2024
56d69ef
congruence
Tsar-Salat Nov 10, 2024
58b684d
try this
Tsar-Salat Nov 10, 2024
69901b4
ugh
Tsar-Salat Nov 10, 2024
16ae1cd
shielded fix
Tsar-Salat Nov 10, 2024
67ad89e
genericize modsuit parts
Tsar-Salat Nov 10, 2024
68df440
overslot fixes
Tsar-Salat Nov 10, 2024
49da73c
any slot we want
Tsar-Salat Nov 10, 2024
ce6a985
module update
Tsar-Salat Nov 10, 2024
6c55622
kinesis buff
Tsar-Salat Nov 10, 2024
2a9964f
out manager support
Tsar-Salat Nov 10, 2024
99c51b2
ore bag support
Tsar-Salat Nov 10, 2024
e15846a
9/02/2022 modsuit fixes
Tsar-Salat Nov 10, 2024
5314434
suit storage
Tsar-Salat Nov 10, 2024
1f4e703
module pinning
Tsar-Salat Nov 10, 2024
6e739f8
modsuit AI's count for objectives
Tsar-Salat Nov 10, 2024
a7440b2
medical modsuit update
Tsar-Salat Nov 10, 2024
2a93223
status readout
Tsar-Salat Nov 10, 2024
ebb5ba1
new modsuit ui
Tsar-Salat Nov 10, 2024
66cf1f3
fix on/off
Tsar-Salat Nov 10, 2024
94547da
modsuit adapter shell
Tsar-Salat Nov 10, 2024
53ca4cb
WIP on modsuits-take5
Tsar-Salat Nov 10, 2024
2acb201
unhardcode modsuit parts
Tsar-Salat Nov 10, 2024
e810a99
casting
Tsar-Salat Nov 10, 2024
26b0f4b
circuit issue
Tsar-Salat Nov 10, 2024
5629d17
nuclear option
Tsar-Salat Nov 10, 2024
6d22c19
limbless rejoice
Tsar-Salat Nov 10, 2024
e1b1b23
fix overlay
Tsar-Salat Nov 11, 2024
53340ff
GRRRR
Tsar-Salat Nov 11, 2024
1012f41
fix up segmentation issues
Tsar-Salat Nov 11, 2024
ea95eac
pinner?
Tsar-Salat Nov 11, 2024
6f09a9d
processing fix
Tsar-Salat Nov 11, 2024
8aff046
Revert "pinner?"
Tsar-Salat Nov 11, 2024
3aab805
fix bad del
Tsar-Salat Nov 11, 2024
d629896
mapedits
Tsar-Salat Nov 11, 2024
6eb213d
oops
Tsar-Salat Nov 11, 2024
8e657da
rad fix
Tsar-Salat Nov 11, 2024
200caf1
fix status_traits runtime
Tsar-Salat Nov 11, 2024
3ec23a3
add lights
Tsar-Salat Nov 11, 2024
6078572
engineering tweaks
Tsar-Salat Nov 12, 2024
46a47a4
fix kinesis
Tsar-Salat Nov 12, 2024
55ad065
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Nov 17, 2024
480fbf4
merge skew oopsie
Tsar-Salat Nov 17, 2024
7341cef
looping sound, map, and outfit
Tsar-Salat Nov 17, 2024
b8b1b31
oops
Tsar-Salat Nov 17, 2024
fcc117e
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Nov 18, 2024
a43239c
trait refs
Tsar-Salat Nov 18, 2024
5577be0
Revert "trait refs"
Tsar-Salat Nov 18, 2024
2e54411
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Nov 18, 2024
1831a33
le fix
Tsar-Salat Nov 20, 2024
9451cbb
kar fix
Tsar-Salat Nov 20, 2024
02d8b7d
ethereal heart business
Tsar-Salat Nov 20, 2024
7f1cbb8
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Nov 20, 2024
856859f
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Nov 23, 2024
5acb0c0
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Nov 30, 2024
59e4ee7
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 1, 2024
f9d56e6
kinetic acc
Tsar-Salat Dec 1, 2024
5780886
oops
Tsar-Salat Dec 1, 2024
9219307
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 3, 2024
28a636b
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 4, 2024
8656436
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 7, 2024
fa81175
cooldown removal
Tsar-Salat Dec 7, 2024
5d1ed2b
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 7, 2024
671822c
conversion & adds rad protection to engineering modsuits
Tsar-Salat Dec 7, 2024
9a11f80
hmm, thats supposed to be a number...
Tsar-Salat Dec 7, 2024
b8be875
No wonder the modules didnt fucking work...
Tsar-Salat Dec 7, 2024
f172de6
update for gravity pr
Tsar-Salat Dec 7, 2024
86e08ab
trying to fix visors...
Tsar-Salat Dec 7, 2024
11872cb
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 8, 2024
86cded7
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 22, 2024
56c5439
fix ert name
Tsar-Salat Dec 22, 2024
cd3b868
add support for module traits
Tsar-Salat Dec 22, 2024
975bc70
revert warn
Tsar-Salat Dec 22, 2024
5502529
fix chameleon module
Tsar-Salat Dec 22, 2024
ba34e67
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Dec 25, 2024
96c1226
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Jan 2, 2025
f7d618e
dejaku fix 1
Tsar-Salat Jan 2, 2025
3a8fa55
dejaku fix 2
Tsar-Salat Jan 2, 2025
c979b16
dejaku fix 3
Tsar-Salat Jan 2, 2025
86c2851
dejaku fix 4
Tsar-Salat Jan 2, 2025
c4cad3d
unused
Tsar-Salat Jan 3, 2025
f4368d2
requested changes
Tsar-Salat Jan 12, 2025
b778285
bad idea
Tsar-Salat Jan 12, 2025
b7d0842
forgot about you
Tsar-Salat Jan 12, 2025
736bf9f
unused
Tsar-Salat Jan 12, 2025
979ea14
Merge branch 'master' into modsuits-take5
Tsar-Salat Jan 12, 2025
89330d5
address reviews
Tsar-Salat Jan 14, 2025
86401a2
For you, Meson! Not for me!
Tsar-Salat Jan 14, 2025
f727e12
antimagic check
Tsar-Salat Jan 14, 2025
8b67dbf
remove from atmosians (explo, mining, and atmos are now the unmodded)
Tsar-Salat Jan 14, 2025
05642c1
spacemove
Tsar-Salat Jan 14, 2025
37a0a42
revert bci
Tsar-Salat Jan 14, 2025
268d513
hnnnnng
Tsar-Salat Jan 14, 2025
51d107b
fix mesons
Tsar-Salat Jan 14, 2025
dd7e20e
examinate
Tsar-Salat Jan 15, 2025
7487204
.
Tsar-Salat Jan 15, 2025
d2e0927
pathfinder and individual suit fixes
Tsar-Salat Jan 16, 2025
d0bc854
autoupdate
Tsar-Salat Jan 16, 2025
25629d6
balance and add loaders/medical modsuits to roundstart station
Tsar-Salat Jan 16, 2025
55dd7a3
forcestanding
Tsar-Salat Jan 16, 2025
b62e843
minor untangle
Tsar-Salat Jan 16, 2025
71024cd
lower slowdown
Tsar-Salat Jan 17, 2025
ef06612
adds pathfinder plus, the suit that loves you
Tsar-Salat Jan 17, 2025
48fec5f
domineering AIs, better be diplomatic.
Tsar-Salat Jan 17, 2025
f2f2694
lower highest tiers by 1
Tsar-Salat Jan 17, 2025
ed18bd4
dont lock it if its still open
Tsar-Salat Jan 17, 2025
428a656
oops
Tsar-Salat Jan 17, 2025
04f69bf
supply
Tsar-Salat Jan 17, 2025
a663a4b
maybe?
Tsar-Salat Jan 18, 2025
3f08368
WIP on hotkeyshit
Tsar-Salat Jan 18, 2025
4fc2083
.
Tsar-Salat Jan 18, 2025
657520f
fix drop key
Tsar-Salat Jan 18, 2025
05e46c7
actions
Tsar-Salat Jan 18, 2025
646b423
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Jan 19, 2025
38e96b4
try this
Tsar-Salat Jan 19, 2025
3d2180b
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Jan 23, 2025
ae3d4c4
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Jan 25, 2025
0500c1d
.
Tsar-Salat Jan 25, 2025
8038477
span conversions
Tsar-Salat Jan 26, 2025
2ad4898
Merge remote-tracking branch 'BeeStation/master' into modsuits-take5
Tsar-Salat Jan 26, 2025
3277cbe
unlock springlock functionality
Tsar-Salat Jan 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
requested changes
  • Loading branch information
Tsar-Salat committed Jan 12, 2025
commit f4368d21cf7c6a78f95a64f4172ae61bf1caf511
43 changes: 27 additions & 16 deletions code/__DEFINES/obj_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,34 @@

// Flags for the clothing_flags var on /obj/item/clothing

#define LAVAPROTECT (1<<0)
#define STOPSPRESSUREDAMAGE (1<<1) //! SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
#define BLOCK_GAS_SMOKE_EFFECT (1<<2) //! blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
#define MASKINTERNALS (1<<3) //! mask allows internals
#define NOSLIP (1<<4) //! prevents from slipping on wet floors, in space etc
#define THICKMATERIAL (1<<5) //! prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
#define VOICEBOX_TOGGLABLE (1<<6) //! The voicebox in this clothing can be toggled.
#define VOICEBOX_DISABLED (1<<7) //! The voicebox is currently turned off.
#define BLOCKS_SHOVE_KNOCKDOWN (1<<8) // Prevents shovies against a dense object from knocking the wearer down.
#define SNUG_FIT (1<<9) //! prevents hat throwing from knocking this hat off
#define EFFECT_HAT (1<<10) //! For hats with an effect that shouldn't get knocked off ie finfoil
#define SCAN_REAGENTS (1<<11) //! Allows helmets and glasses to scan reagents.
#define SCAN_BOOZEPOWER (1<<12) //! Allows helmets and glasses to scan reagents.
#define MASKEXTENDRANGE (1<<13) //! For masks, allows you to breathe from internals on adjecent tiles
#define NOTCONSUMABLE (1<<14) //! Moths cannot eat clothing with that flag
/// Protects from lava
#define LAVAPROTECT (1<<0)
/// SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
#define STOPSPRESSUREDAMAGE (1<<1)
/// Blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
#define BLOCK_GAS_SMOKE_EFFECT (1<<2)
/// Mask allows internals
#define MASKINTERNALS (1<<3)
/// Prevents from slipping on wet floors, in space etc
#define NOSLIP (1<<4)
/// Prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
#define THICKMATERIAL (1<<5)
/// The voicebox in this clothing can be toggled.
#define VOICEBOX_TOGGLABLE (1<<6)
/// The voicebox is currently turned off.
#define VOICEBOX_DISABLED (1<<7)
/// Prevents shovies against a dense object from knocking the wearer down.
#define BLOCKS_SHOVE_KNOCKDOWN (1<<8)
/// Prevents hat throwing from knocking this hat off
#define SNUG_FIT (1<<9)
/// For hats with an effect that shouldn't get knocked off ie finfoil
#define EFFECT_HAT (1<<10)
/// For masks, allows you to breathe from internals on adjacent tiles
#define MASKEXTENDRANGE (1<<11)
/// Moths cannot eat clothing with that flag
#define NOTCONSUMABLE (1<<12)
/// Usable as casting clothes by wizards (matters for suits, glasses and headwear)
#define CASTING_CLOTHES (1<<15)
#define CASTING_CLOTHES (1<<13)
/// Headgear/helmet allows internals
#define HEADINTERNALS (1<<18)

Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_NOSLIPWATER "noslip_water"
/// Stops all slipping and sliding from ocurring
#define TRAIT_NOSLIPALL "noslip_all"
/// Prevents some severe head injuries being sustained from heavy collisions or blunt force injuries.
#define TRAIT_HEAD_INJURY_BLOCKED "head_injury_blocked"

/// Unlinks gliding from movement speed, meaning that there will be a delay between movements rather than a single move movement between tiles
#define TRAIT_NO_GLIDE "no_glide"
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_NO_BLEEDING" = TRAIT_NO_BLEEDING,
"TRAIT_BLOOD_COOLANT" = TRAIT_BLOOD_COOLANT,
"TRAIT_MADNESS_IMMUNE" = TRAIT_MADNESS_IMMUNE,
"TRAIT_HEAD_INJURY_BLOCKED" = TRAIT_HEAD_INJURY_BLOCKED,
"TRAIT_HEAVY_SLEEPER" = TRAIT_HEAVY_SLEEPER,
"TRAIT_NIGHT_VISION" = TRAIT_NIGHT_VISION,
"TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP,
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/clockwork.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
if(ORGAN_SLOT_EYES)
var/obj/item/organ/eyes/robotic/clockwork/organ = new()
if(robustbits)
organ.flash_protect = 1
organ.flash_protect = FLASH_PROTECTION_FLASH
organ.Insert(H, TRUE, FALSE)
if(prob(40) && H.stat != DEAD)
to_chat(H, "<span class='userdanger'>You feel a stabbing pain in your eyeballs!</span>")
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/heal.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
prefixes = list("Sleeping ", "Regenerative ")
suffixes = list(" Coma")
var/deathgasp = FALSE
var/stabilize = TRUE
var/stabilize = FALSE
var/active_coma = FALSE //to prevent multiple coma procs
threshold_desc = "<b>Stealth 2:</b> Host appears to die when falling into a coma, triggering symptoms that activate on death.<br>\
<b>Resistance 4:</b> The virus also stabilizes the host while they are in critical condition.<br>\
Expand Down
12 changes: 6 additions & 6 deletions code/game/objects/structures/crates_lockers/closets/bodybag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
if(t)
name = "body bag - [t]"
tagged = 1
update_icon()
update_appearance()
else
name = "body bag"
return
else if(I.tool_behaviour == TOOL_WIRECUTTER)
to_chat(user, "<span class='notice'>You cut the tag off [src].</span>")
name = "body bag"
tagged = 0
update_icon()
update_appearance()

/obj/structure/closet/body_bag/update_icon()
..()
if (tagged)
add_overlay("bodybag_label")
/obj/structure/closet/body_bag/update_overlays()
. = ..()
if(tagged)
. += "bodybag_label"

/obj/structure/closet/body_bag/open(mob/living/user)
. = ..()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -771,7 +771,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
desc = "Abduct with style - spiky style. Prevents digital tracking."
icon_state = "alienhelmet"
item_state = "alienhelmet"
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT

/obj/item/clothing/head/helmet/abductor/equipped(mob/living/user, slot)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
..()
var/obj/item/organ/eyes/E = user.getorganslot(ORGAN_SLOT_EYES)
if (E)
E.flash_protect = 2 //Adjust the user's eyes' flash protection.
E.flash_protect = FLASH_PROTECTION_WELDER //Adjust the user's eyes' flash protection.
to_chat(user, "We adjust our eyes to protect them from bright lights.")
else
to_chat(user, "We can't adjust our eyes if we don't have any!")
Expand All @@ -27,12 +27,12 @@
if(E)
if(!active)
E.sight_flags |= SEE_MOBS | SEE_OBJS | SEE_TURFS //Add sight flags to the user's eyes
E.flash_protect = -1 //Adjust the user's eyes' flash protection
E.flash_protect = FLASH_PROTECTION_SENSITIVE //Adjust the user's eyes' flash protection
to_chat(user, "We adjust our eyes to sense prey through walls.")
active = TRUE //Defined in code/modules/spells/spell.dm
else
E.sight_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS //Remove sight flags from the user's eyes
E.flash_protect = 2 //Adjust the user's eyes' flash protection
E.flash_protect = FLASH_PROTECTION_WELDER //Adjust the user's eyes' flash protection
to_chat(user, "We adjust our eyes to protect them from bright lights.")
active = FALSE
user.update_sight()
Expand All @@ -47,6 +47,6 @@
if (active)
E.sight_flags ^= SEE_MOBS | SEE_OBJS | SEE_TURFS
else
E.flash_protect = 0
E.flash_protect = FLASH_PROTECTION_NONE
user.update_sight()
..()
4 changes: 2 additions & 2 deletions code/modules/antagonists/clock_cult/items/brass_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
icon_state = "wraith_specs"
invis_view = SEE_INVISIBLE_SPIRIT
invis_override = null
flash_protect = -1
flash_protect = FLASH_PROTECTION_SENSITIVE
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
glass_colour_type = /datum/client_colour/glass_colour/yellow
Expand Down Expand Up @@ -193,7 +193,7 @@
armor_type = /datum/armor/helmet_clockcult
resistance_flags = FIRE_PROOF | ACID_PROOF
w_class = WEIGHT_CLASS_BULKY
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH
bang_protect = 3


Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/cult/cult_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ Striking a noncultist, however, will tear their flesh."}
name = "zealot's blindfold"
icon_state = "blindfold"
item_state = "blindfold"
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH
vision_correction = 1

/obj/item/clothing/glasses/hud/health/night/cultblind/equipped(mob/living/user, slot)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/heretic/items/heretic_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
desc = "A torn, dust-caked hood. Strange eyes line the inside."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER

/obj/item/clothing/head/hooded/cult_hoodie/eldritch/equipped(mob/user, slot)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/awaymissions/corpse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ CREATION_TEST_IGNORE_SELF(/obj/effect/mob_spawn)
outfit = /datum/outfit/job/miner

/obj/effect/mob_spawn/human/miner/mod
outfit = /datum/outfit/job/engineer/mod
outfit = /datum/outfit/job/miner/equipped/mod

/obj/effect/mob_spawn/human/miner/explorer
outfit = /datum/outfit/job/miner/equipped
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/chameleon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@
desc = "A tough envirohelm woven from alloy threads. It can take on the appearance of other headgear."
//icon_state = "engineer_envirohelm"
item_state = "engineer_envirohelm"
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH

/obj/item/clothing/head/chameleon/drone
// The camohat, I mean, holographic hat projection, is part of the
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
max_integrity = 200
integrity_failure = 0.4
var/damaged_clothes = CLOTHING_PRISTINE //similar to machine's BROKEN stat and structure's broken var
var/flash_protect = 0 //What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
var/flash_protect = FLASH_PROTECTION_NONE //What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
var/bang_protect = 0 //what level of sound protection the item has. 1 is the level of a normal bowman.
var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect
var/up = 0 //but separated to allow items to protect but not impair vision, like space helmets
Expand Down
14 changes: 7 additions & 7 deletions code/modules/clothing/glasses/_glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@
icon_state = "sunhudscience"
item_state = "sunhudscience"
emissive_state = "sun_emissive"
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH

/obj/item/clothing/glasses/science/sciencesun/degraded
name = "degraded science sunglasses"
desc = "A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion."
flash_protect = 0
flash_protect = FLASH_PROTECTION_NONE

/obj/item/clothing/glasses/science/night
name = "night vision science goggles"
Expand Down Expand Up @@ -297,7 +297,7 @@
/obj/item/clothing/glasses/sunglasses/advanced/
name = "advanced sunglasses"
desc = "Strangely ancient technology used to help provide rudimentary eye cover. Has enhanced shielding which blocks flashes."
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH

/obj/item/clothing/glasses/sunglasses/advanced/reagent
name = "beer goggles"
Expand Down Expand Up @@ -371,7 +371,7 @@
item_state = "welding-g"
actions_types = list(/datum/action/item_action/toggle)
custom_materials = list(/datum/material/iron = 250)
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
tint = 2
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
flags_cover = GLASSESCOVERSEYES
Expand All @@ -385,7 +385,7 @@
desc = "A bulky pair of unwieldy glasses that lets you see things best left unseen. Obscures vision, but also has enhanced shielding which blocks flashes."
icon_state = "bustin-g"
item_state = "bustin-g"
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
tint = 2
glass_colour_type = /datum/client_colour/glass_colour/green
force_glass_colour = TRUE
Expand Down Expand Up @@ -427,7 +427,7 @@
desc = "Covers the eyes, preventing sight."
icon_state = "blindfold"
item_state = "blindfold"
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
tint = 3
darkness_view = 1
dog_fashion = /datum/dog_fashion/head
Expand Down Expand Up @@ -487,7 +487,7 @@
/obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete
name = "chameleon thermals"
desc = "A pair of thermal optic goggles with an onboard chameleon generator."
flash_protect = -1
flash_protect = FLASH_PROTECTION_SENSITIVE

var/datum/action/item_action/chameleon/change/chameleon_action

Expand Down
16 changes: 8 additions & 8 deletions code/modules/clothing/glasses/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
icon_state = "sunhudmed"
emissive_state = "sun_emissive"
darkness_view = 1
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH
tint = 1
glass_colour_type = /datum/client_colour/glass_colour/blue

Expand All @@ -156,7 +156,7 @@
/obj/item/clothing/glasses/hud/health/sunglasses/degraded
name = "degraded medical HUDSunglasses"
desc = "Sunglasses with a medical HUD. They do not provide flash protection."
flash_protect = 0
flash_protect = FLASH_PROTECTION_NONE

/obj/item/clothing/glasses/hud/diagnostic
name = "diagnostic HUD"
Expand All @@ -183,13 +183,13 @@
icon_state = "sunhuddiag"
emissive_state = "sun_emissive"
item_state = "glasses"
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH
tint = 1

/obj/item/clothing/glasses/hud/diagnostic/sunglasses/degraded
name = "degraded diagnostic sunglasses"
desc = "Sunglasses with a diagnostic HUD. They do not provide flash protection."
flash_protect = 0
flash_protect = FLASH_PROTECTION_NONE

/obj/item/clothing/glasses/hud/diagnostic/prescription
name = "prescription diagnostic HUDglasses"
Expand Down Expand Up @@ -224,7 +224,7 @@
/obj/item/clothing/glasses/hud/security/chameleon
name = "chameleon security HUD"
desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection."
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH

// Yes this code is the same as normal chameleon glasses, but we don't
// have multiple inheritance, okay?
Expand Down Expand Up @@ -257,14 +257,14 @@
icon_state = "sunhudsec"
emissive_state = "sechud_emissive"
darkness_view = 1
flash_protect = 1
flash_protect = FLASH_PROTECTION_FLASH
tint = 1
glass_colour_type = /datum/client_colour/glass_colour/darkred

/obj/item/clothing/glasses/hud/security/sunglasses/degraded
name = "degraded security HUDSunglasses"
desc = "Sunglasses with a security HUD. They do not provide flash protection."
flash_protect = 0
flash_protect = FLASH_PROTECTION_NONE

/obj/item/clothing/glasses/hud/security/night
name = "night vision security HUD"
Expand Down Expand Up @@ -377,7 +377,7 @@
item_state = "doublegodeye"
vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
darkness_view = 8
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
vision_correction = 1
clothing_traits = list(TRAIT_BOOZE_SLIDER, TRAIT_REAGENT_SCANNER)
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/hardhat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
light_range = 3 //Needs a little bit of tradeoff
dog_fashion = null
actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen)
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
tint = 2
flags_inv = HIDEEYES | HIDEFACE | HIDESNOUT
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/misc_special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
item_state = "welding"
clothing_flags = SNUG_FIT
custom_materials = list(/datum/material/iron=1750, /datum/material/glass=400)
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
tint = 2
armor_type = /datum/armor/utility_welding
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/head/tinfoilhat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
actions_types = list(/datum/action/item_action/toggle_helmet_light)
dynamic_hair_suffix = ""
dynamic_fhair_suffix = ""
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
bang_protect = 1 //make this consistent with other plasmaman helmets
resistance_flags = NONE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
desc = "A gas mask with built-in welding goggles and a face shield. Looks like a skull - clearly designed by a nerd."
icon_state = "weldingmask"
custom_materials = list(/datum/material/iron=4000, /datum/material/glass=2000)
flash_protect = 2
flash_protect = FLASH_PROTECTION_WELDER
tint = 2
armor_type = /datum/armor/gas_welding
actions_types = list(/datum/action/item_action/toggle)
Expand Down
Loading