* Update holy_weapons.dm
* Update holy_weapons.dm
* Add some new nullrods for various religions.
* Update inhands for gohei, whisk, goad.
* Tweak several nullrods.
- Modify weight classes for kirpan, vajra, ganta, gohei, and whisk
- Reduce force of vajra
- Nudge kirpan sheath sprite in belt slot
- More progress on getting vajra and ghanta to equip properly (should be one in each hand when equipped and none inhand if not) (still needs work)
* rod of null
* Update holy_weapons.dm
* Remove force from cleansing nullrods. Rename curved saber.
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
* Remove unknown proc 'is_in_inactive_hand'.
* Partially fix whisk knockback.
* Fix whisker knockback.
* Thanks, linters! part 2
* Change vajra to weapon and ghanta to tile blessing.
* Thanks, linters. part 3
* Call ghanta's activate_self() parent more wisely.
* Tweak visible and audible messages.
* Thanks, linters!
* Fix some of the wackiness with Vajra pickup.
* Prevent ghanta from being placed somewhere all alone.
* Handle some cases where vajra equipped to wrong hand.
* Tweak nullrod documentation.
* Update icon on sheaths when initializing.
---------
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: Fordoxia <Thrash97@googlemail.com>
* skulk.dm placeholder for testing purposes
* Made an oopsie, fixed
* Skulk flesh color and language color testing
* Adding working language key, fixed language color
* Changed skulk flesh color, may change it again soon
* Ran tgui, hopefully fixed language color
* Changed skulk language color, hopefully for good this time
* Missed a spot
* Tgui fuckery
* If at first you don't succeed, cry to yourself for a bit then try again
* Tgui makes me violent
* Eyewear no longer save Skkulakin from flashes
* Skulk bones now hurt really bad
* Adds Skulk Sprites, Back Accessories, and other Placeholders
* Desperately trying to get body_accessories to work
* Minor name changes
* Skkulakin now have colorable eyes
* Makes the silk-spinning ability somewhat work, more changes need to be made
* Fixes the Skulks' ability to spin silk, however still needs changes
* Changed Skulks easier bone breaks into a trait
* Skulks (Now with 100% ethically sourced back spines!)
* Gives Skkulakin the Vox clothing sprites (Not counting head, glasses, or masks)
* Added update_spines_layer() for testing and help purposes
* Working on getting Skulk Backspines to change color depending on preset
* Skulk Backspines are now colored the same as your preset up spawning in (Thank you, Qwerty)
* Undefines SILK_NUTRITION_AMOUNT (I made a woopsie)
* Readds a return I may have accidentally removed at some point
* Skkulakin can now chitter
* Silk now be used to craft cloth and has an icon
* TGUI is going to make me do things
* Fixes the Brittle Bones Trait to work with Frail Quirk
* Sprite Fix
* Adds masking helpers
* Made a small woopsie
* I'm genuinely a fucking idiot
* Adds a bunch of new clothing
* Changes some clothing descriptions
* Fixes more placeholders and adds two new outfits
* Made small mistake, fixed
* Temporary change (Will revert soon)
* Reverted previous changes as the event is now over
* New Skulk Clothing, added some to the racial tab in the loadout, and made low-inquis robes orderable from cargo
* Adds High-Inquis Robes into cargo console
* Adds Skkulakin Flag (Orderable From Merch Vendor)
* Made small mistake, fixed it
* Inquisitorial Crate only has Low-Inquisitor clothing again
* Commits all offered suggestions
* Converts spans to defines and sorts out the rest of Skulk clothing (No MODs just yet)
* Gives Skulks the Nian Butt Sprite for now
* Fixes a small error with biosuits
* Fixes small coding error
* Fixes a few mor small coding errors
* Update code/modules/mob/living/carbon/human/appearance.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
* Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
* Update code/modules/economy/merch_items.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
* Removes 'collective' from outfit_admin.dm
* Basic Pixel-Shifting (Not Yet Complete)
* improve skulk headwear offset
* Revert "improve skulk headwear offset"
This reverts commit 2d93d61699.
* improve skulk headwear offset
* Cleans up some code and fixes ALL hats for Skkulakin
* Lets the AI speak Skkula-Runespeak, fixes Bomber Jackets and Winter Coats, makes Backpacks look better, fixes other small sprite issues
* Let them wear pants
* Update code/modules/mob/language.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
* Fixes masks and glasses for skkulakin
* Fixes Inquisitor Masks and adds missing Engineering Outfits
* Fixes Explorer Suits and HECK Suit for Skulks
* Fixes a few small issues and resolves some suggested changes
* Rebuilds TGUI
* Fixes Science Jumpsuits & Radsuits
* Fix Skkulakin chef belt disappearance.
* fix string assoc lookups for alists
* Update code/game/objects/structures/mirror.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
* Update code/modules/mob/living/carbon/human/species/skulk.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
---------
Signed-off-by: AVeryReluctantSpider <102713858+AVeryReluctantSpider@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
* Add a LOT of chaplain clothes from various religions.
* Thanks, linter!
* Deploy vendors, box envirosuits, unaccent names
* Thanks, linters!
* Accommodate ears.
* Correct accent oversight.
* Merge branch 'master' into chaplain-outfits
Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
* Refactor /mob/unEquip.
* fix things found in testing
* more fixes from testing
* fix removal of hooded suits
* fix flayers inability to deploy swarmprod
* fix changeling blade activation
* unnecessary parens
* pass default unequip args to proc overrides
* fix belts being able to forceMove into full hands
* refactor: Attack chain, initial setup.
* migrate curtain to make dreamchecker happy
* update thurible
* don't call attacked_by separately for legacy attack chain
* remove duplicate proc
* condense similar code, put allowances for legacy code in new procs
* update docs, include diagram source
* add comment on how to update diagram
* fix admonition
* mindflayer updates
* remove commented out code
* clarify all steps
* after_attack should be overridable
* whoops
* retrofit recent changes
* duh, can't restrict this yet because of tool_acts
* i hate ore bags with the fire of a thousand suns
* return correct value for object attack logic
* Various cleanups.
We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.
I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.
* simplify some argument names
* fuck it
* make it do the thing
* Rename CI module call
* Prove that CI works
* improve test output
* aaand fix it again
* fix curtain tool interactions
* fix compile error
* fix compile error
* Better docs, introduce migration plan tool.
* 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>
* Full Auto Gun Mode Component
* Apply some refactoring
* spaces mhmm
* Some signal movement
* Apply DGamerL suggestions
* Unknown SIGNAL_HANDLER no more
* Fix runtime if uid is passed
* Why the hell you even care
* god you serious
---------
Co-authored-by: Gottfrei <zweisen@gmail.com>
* add the new stuff
* guh
* add the brunt of it
* action button stuff
* adds a lot of other stuff
* careful find and replace
* it loads
* so many huds
* ehh yeah this kinda works
* fixes this runtime
* hacks in some DMI stuff, we'll fix it later
* Adds better mouse pointer for dragging buttons
* gets dragging into place working again, updates DMI
* moves define
* remove extra hud defines, now it compiles
* CHECK GREP
* owww
* rename action defines
* ticks
* are we good
* let's try that again
* renames mob vars
* renames
* fixes some hud issues with huds getting the wrong variable
* fixes some alignment issues
* Adds mouse-wheel scroll support
* left -> right
* I am the entire circus
* first self-review pass
* Another review pass -- just realized I need to fix keybinds
* more testing
* update icons
* oops
* Fix spell icons not appearing properly
* fixes some outstanding issues
- Action button backgrounds now work properly
- Fixes some runtimes on dropping
- Fixes some misplaced icons
* hmm
* weh
* again?
* nah?
* maybe this?
* asdf
* should finally fix CI
* add client check
* move the ?
* add missing override causing runtimes
* shift-clicking now doesn't trigger the button
* better docs
* cult 1
* massive data refactor
* progress
* More crap
* IM SCARED IT COMPILES
* oops
* more fixes
* good comment
* hell yeah, team control
* lol
* blamo
* blam
* More stuff
* team refactor
* epic merge fail
* src not _src_
* more
* progress
* cult
* more stuff
* water
* goodbye __IMPLIED_TYPE__
* time to undraft
* FUCK FUCK FUCK
* okay this is better
* goodbye todos
* fix
* order of operations
* last fix? maybe
* yeah
* oops
* okay this should be ALL the fixes
* wow
* hell yeah
* wow
* fixes duplicate teams + adds more team safeties
* how the fuck did this happen
* admin objective improvements
* wah more bullshit
* guh
* fuuuuck
* fucking hell
* fixes
* Converts isHoly into a trait
* Moves holy from body to mind
* Uncurses the source of curses
* Updates source to roundstart trait
* Contrabang fixes
* Forgot one
* Add trait mind helper
* Request changed Dgamerr/Contra
* Fixes issue
* Nullchecks minds
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file
* removing for now
* its conflict time
* lets fix this conflict
* ah shit
* here we go again
Alan