Commit Graph
8 Commits
Author SHA1 Message Date
kyunkyunkyunandGitHub b0463d3c83 Convert most spans to defines (#31080)
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
2025-12-13 23:55:48 +00:00
d90a70ecda [REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-13 13:02:29 +00:00
9465b565b8 refactor/ci: enforce mapload in Initialize args (#26878)
* refactor/ci: enforce mapload in Initialize args

* add new missing mapload arg

* add yet another missing mapload arg

* Update code/modules/power/engines/singularity/particle_accelerator/particle.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-10-23 19:07:46 +00:00
PopeDaveThe3thandGitHub ed8809a4fc Fixes Soviet Mobs being Invisible (#27064)
* i feex

* statue
2024-10-12 11:26:24 +00:00
e657597b1c [LORE] Replaces most uses of "Russian" with "Soviet" (#26822)
* no russian

* space

* more spaces

* Update walls_mineral.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update space_ruins.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2024-10-10 09:57:42 +00:00
d1ba470eac Making Bearserk Good (#23796)
* First buffs + More proper Status Icon

* Slight sprite change to look a bit less shit

* Additional tweaks

* Code consistency tweak

* Slightly higher price

* More tweaks and fixing a bug

* Brand new Icon courtesy of McRamon

* Tweaked icon a bit

* A bit more recommended code cleaning

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* how did i not notice this?

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-01-21 21:31:19 +00:00
DGamerLandGitHub bf5a82365a [s[ Fixes bearserker (#23786)
* Neat

* Remove .
2024-01-12 14:34:09 +01:00
b6f9130a26 Rage of the Space Bear & The Bearserker Pelt (#23050)
* Adds Bearserk combos

* Adds main Bearserk file

* Adds Berserker Bear Pelt to uplink items

Blacklisted from Nuclear and SST because Nukies always use modsuits, and SST won't be very stealthy if it's rocking the martial arts bear pelt.

* Update bearserk.dm

Minor tweak

* Update uplink_traitor.dm

Another minor tweak

* Update bear_jaws.dm

* Update paw_slam.dm

* Update smokey.dm

* Update uplink_traitor.dm

* Update bear_jaws.dm

* More Balance Tweaks

* Whoopsies forgot a thing

* Improved flavour text for Uplink

Please give a warm welcome to a new cult (that only exists in flavour); Children of Ursa Major!

* More Changes

* Updated flavour text for Bear Jaws

* Updated flavour text for Bear Jaws

* Added a bit of Smoh'Kie to Smokey

* Minor alteration

* Minor flavour text tweak

Made with love and copious amounts of vodka

* I had an even better pun idea

* Made cost identical to Carp

* Ticked the files

* Swapped the weights of Bearserk and Carp

* Moved some resistances to a status buff

* Fixed inexplicably formed code bugs

* More inexplicable code fuckery *scream

* Part 1 of Swapping weights of Bearserk and Carp

* Second part

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

I do agree the IsWeakened is rather redundant

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

* Added Suggestion

* Added Suggestion

* Added Suggestion

However, considering the && are causing check fails, this may be reverted

* Added Suggestion

* Added Suggestion, may be reverted if issues arise

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added Suggestion

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Removed Antag Checks on Equipping and Unequipping the Pelt

As per Contrabang's suggestion

* Added a Suggestion and sound for Bearserker Rage

* Added Suggestion

I like consistency, so thank you

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Added placeholder status icon

* Added Suggestion

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Added Suggestion

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Added Suggestion

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-01-09 13:05:44 +00:00