PollardTheDragon
3b0a9c4381
Converts a whole lot of friendly mobs to basic mob AI ( #29815 )
...
* Butterflies, Cockroaches, Slothes, Snakes, Penguins, and Bunny Basic Mobs
* Lizards too
* Oops
* Lizard emote keybind
* Updatepaths
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Moved lizard emote to basic_emotes.dm, simplified hide action
* New linters
* Merge conflict resolution
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-08-06 01:17:13 +00:00
Contrabang
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
kyunkyunkyun
75202c986e
Fix and refactor of chainsaws ( #28893 )
...
* code improvements
* linters
* oh
* Update spellblade.dm
* Update spellblade.dm
* Update melee.dm
* melee's death
* update paths
* Update code/game/objects/items/weapons/melee/melee.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
* fix icon states
---------
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-07-23 17:32:47 +00:00
Stone
ccde8980d4
modified: code/game/objects/items/weapons/melee/melee_misc.dm ( #29365 )
2025-05-27 20:53:18 +00:00
warriorstar-orion
45e88ffb71
refactor is_blocked_turf ( #29324 )
2025-05-21 00:43:45 +00:00
kyunkyunkyun
093f5dbe1c
Update energy_melee_weapons.dm ( #28840 )
2025-04-04 16:19:45 +00:00
kyunkyunkyun
5563f3ff19
3 weeks later ( #28854 )
2025-04-04 07:51:50 +00:00
kyunkyunkyun
dacb831874
wow ( #28415 )
2025-03-12 15:32:23 +00:00
kyunkyunkyun
b3bdb3b43e
Fix forcewall, temporal spellblades + H.E.C.K. suit processing ( #28413 )
...
* 2 fixes!!
* ok, give it a bit more time
2025-02-26 10:03:48 +00:00
chuga-git
38642d5888
CI lint for UID() misuse ( #28465 )
...
* Adds CI check for UID() being passed parameters.
* Fixes cases of UID() being passed parameters.
2025-02-21 19:35:02 +00:00
warriorstar-orion
0eafad8475
Refactor /mob/unEquip. ( #27720 )
...
* 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
2025-01-10 01:58:35 +00:00
Contrabang
0e765746b6
Adds a new TGUI Admin Antag Menu ( #27545 )
...
* Adds a new TGUI Admin Antag Menu
* Prettier
* fuck
* oops
* swap this shiiit
* Rebuild
* changes
* hate contractors, simple as
* welp forgot this
* fix
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-12-15 01:39:12 +00:00
warriorstar-orion
d23c808e47
Fixes several attack chain call sites ( #27553 )
2024-12-06 22:20:12 +00:00
warriorstar-orion
525c68d617
Attack chain, initial setup. (pull *immediately* for *any* TM issues) ( #26834 )
...
* 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.
2024-12-02 23:36:36 +00:00
Qwertytoforty
c50ff7ce9c
Adds a new spellblade enchantment: Temporal. Also adds lightning knockdown back. ( #27314 )
...
* cutting edge
* remove the message admins lmao
* eh name should just be temporal
* undef
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* updates description, removes shock change as it happens on live now I guess
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-11-23 13:50:39 +00:00
Chap
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
Contrabang
e3c0198737
Adds CI to prevent manual calls of update_icon_state, update_overlay, etc. ( #27010 )
...
* CI something something
* last fix
2024-10-22 12:46:00 +00:00
Paul
95b2d62e4f
Captain's saber help intent slaps with flat of blade ( #26869 )
...
* help intent with the saber slaps
* fix if statements to make papa linter happy
* misc code improvements suggested by contrabang
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-10-09 10:54:03 +00:00
Сиротка
b6f51c1f49
Nerf Space Loot ( #26738 )
...
* Decrease Gamer loot in space
* Update depot_spawners.dm
* Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com >
* Update depot_spawners.dm
* Update code/game/objects/effects/spawners/depot_spawners.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com >
* Update energy_melee_weapons.dm
---------
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-10-06 09:28:11 +00:00
Kenionatus
95888bbfc1
Add Seppuku to the Captain Saber ( #26936 )
...
Simple (almost 1 to 1) copy paste from eswords (because oop sucks).
2024-10-03 13:17:17 +00:00
Coolrune206
fb199c82b9
fixes saber spelling ( #26766 )
2024-09-19 02:26:03 +00:00
Qwertytoforty
8925b33df4
oopsie ( #26810 )
2024-09-17 16:19:08 +00:00
Silverplate
024af9c248
Removes tech levels from high risk items ( #26725 )
2024-09-16 03:28:49 +00:00
Christasmurf
1f9945ee5f
Captain's sabre - Resprite and rebrand ( #26592 )
...
* rapier-rebrand
* extdesc change
* indentation
* Update code/game/objects/items/weapons/melee/melee_misc.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com >
---------
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-12 17:24:14 +00:00
CRUNCH
9ef47e7935
Enhances the Smoking Experience - Adds Many New Item Interactions for Cigarettes and Items Interacting With Them ( #25571 )
...
* Refactoring and other stuff.
* moar
* More smoking
* Update energy_melee_weapons.dm
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update cigs.dm
* Update cigs.dm
* Update cigs.dm
* Update code/game/objects/items/weapons/lighters.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* eee
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* sigh
* Update cigs.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* hell
* Update cigs.dm
* aa
* cool
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* aa
* aaa
* suffering
* Soon
* Is it done!? Am I finally free!?
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update
* Update
* No longer assume the cig is in a mouth
* Update tools.dm
* Update pronouns.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* update
* Attack animations for sword lighting!
* Update
* indentation
* Update cigs.dm
* minor refactor
* Update items.dm
* Update items.dm
* Update welder.dm
* Update energy_melee_weapons.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* refactor
* Update items.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Update flamethrower.dm
* clipping
* Update legion_loot.dm
* anti attack check
* Fixes a zippo runtime
* Fixes evil runtime and stops unnecessary violence.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update based on review
* Update cigs.dm
* Update energy_melee_weapons.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update toys.dm
* Update energy_melee_weapons.dm
* Update legion_loot.dm
* Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-03 13:02:13 +00:00
PollardTheDragon
2d94ff16f4
Getting Medieval - Breach Cleaver ( #26298 )
...
* Securiblade, Sheaths
* Snakesfang and Cleaver
* Crates and Armory
* Origin Tech Fix
* Chargers can now accept securiblades
* Clan Cleaver is now Breach Cleaver
* Armor Checking
* Comment and description fixes
* State comment
* More Comments
* Contains list fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Breacher sword hates doors
* Tab indentation
* Breacher Armor Buff - Status Effect while wielding
* Breach Cleaver Sounds - courtesy of Stoniest
* Snakesfang Codersprites
* Define Fix
* Breach Cleaver - Icon Codersprites
* Breach Cleaver Codersprites
* Gave help-intent attack on cleaver an animation
* Reduced sound intensity of wielded harm
* Moved variables below inherits
* Buff spacing, guard clause
* Improved examine
* Guard clauses the secsword powercell
* Sword mode defines
* Added undefs
* Spacing
* Securiblade loreful examine_more
* Examine_More for all swords
* Grammar
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Moved defines, added auto-docs, grammar
* Fixed secsword recharging
* Secsword burn function fix
* Cleaver Armor Buff Fix
* Fix to buff
* Securiblade burn fix, stamina charge reduction fix
* Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed
* Fixes securiblade EMP oversight
* Snakesfang can parry now
* Spelling
* Removed define indents
* Early returns
* A whole lot of fixes. Qdels the cell on delete.
* stun_delay proc doc
* Update code/datums/uplink_items/uplink_general.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Merged IF statements, relocated inits
* Armor change
* Remove null in cell variable
* Ifs to Switch
* Revert "Armor change"
This reverts commit 6b61e33433108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removed extraneous permit var
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Early returns on object attacks
* Fixed missing cleaver sheath
* Fixed comment format
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Removed extraneous line
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* cleaving_armor_boost variable standardization
* Added intent and effects to attack logs
* Added notice to description span for antags
* Made the armor buff into a var
* Replaced get_dir(src, get_step away(H, src) with user.src
* Fixed stat check
* AP Changes
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-08-09 01:03:47 +00:00
CRUNCH
7e09585464
Gives Most High-Risk Items Extended Descriptions ( #25630 )
...
* LORE!
* MORE LORE!
* Update code/modules/hydroponics/gene_modder.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update krav_maga.dm
* Update code/game/objects/items/weapons/cards_ids.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update nuclearbomb.dm
* Apply suggestions from code review
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* NAD
* Update teleportation.dm
* Update armor_suits.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update documents.dm
* Update magboots.dm
* very minor edits.
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* update
* Update armor_suits.dm
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* format
* Update code/modules/hydroponics/gene_modder.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update defib.dm
* Update armor_suits.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-08-04 08:05:38 +00:00
PollardTheDragon
521c43e2aa
Getting Medieval - Snakesfang ( #26296 )
...
* Securiblade, Sheaths
* Snakesfang and Cleaver
* Crates and Armory
* Origin Tech Fix
* Chargers can now accept securiblades
* Clan Cleaver is now Breach Cleaver
* Armor Checking
* Comment and description fixes
* State comment
* More Comments
* Contains list fix
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Breacher sword hates doors
* Tab indentation
* Breacher Armor Buff - Status Effect while wielding
* Breach Cleaver Sounds - courtesy of Stoniest
* Snakesfang Codersprites
* Define Fix
* Breach Cleaver - Icon Codersprites
* Breach Cleaver Codersprites
* Gave help-intent attack on cleaver an animation
* Reduced sound intensity of wielded harm
* Moved variables below inherits
* Buff spacing, guard clause
* Improved examine
* Guard clauses the secsword powercell
* Sword mode defines
* Added undefs
* Spacing
* Securiblade loreful examine_more
* Examine_More for all swords
* Grammar
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Moved defines, added auto-docs, grammar
* Fixed secsword recharging
* Secsword burn function fix
* Cleaver Armor Buff Fix
* Fix to buff
* Securiblade burn fix, stamina charge reduction fix
* Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed
* Fixes securiblade EMP oversight
* Snakesfang can parry now
* Spelling
* Removed define indents
* Early returns
* A whole lot of fixes. Qdels the cell on delete.
* stun_delay proc doc
* Update code/datums/uplink_items/uplink_general.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Merged IF statements, relocated inits
* Armor change
* Remove null in cell variable
* Ifs to Switch
* Revert "Armor change"
This reverts commit 6b61e3343380364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Appearance update
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Update code/game/objects/items/weapons/melee/melee_misc.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-30 13:46:44 +00:00
Spaghetti-bit
cbeedfca9f
Parrying Refactor, Adding Parrying to Select Two-handed Weapons: Parry This You Filthy Casual! ( #26043 )
...
* Refactors parrying and how parrying is handled. Also gives most of the melee wizard weapons parrying as well as most two handed weapons.
* Forgor the blood spear :)
* Renames `special_parry_condition` to `requires_two_hands`
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Update code/datums/components/parry.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* applies suggestion from @lewcc
* Removes the two handed requirement from cult spear as per @Qwerty's request
* Apply suggestions from code review (1/2) from hal
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Apply suggestions from code review (2/2)
* ...accidentally removed an icon in `energy_melee_weapons.dm` when I deconflicted stuff. 💀 ready for review.
* Again, variable added back during deconflict. issues resolved.
* Update code/game/objects/items/weapons/shields.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2024-07-30 12:33:02 +00:00
CRUNCH
e3d67c4f7d
Miscellaneous Code Tidying ( #26180 )
...
* Update items.dm
* Update welder.dm
* Update energy_melee_weapons.dm
* Update items.dm
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
2024-07-10 03:34:49 +00:00
DGamerL
e5915846fa
Changes energy sword sharpening to use signals ( #26157 )
...
* We love signals in this household
* This isn't needed
* Coconut review
* Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Adds handler
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-08 13:03:32 +00:00
Qwertytoforty
e7adf789e1
bluespace spellblade and modsuit teleporter module work better ( #25900 )
...
* bluespace spellblade and modsuit teleporter module work better
* nah this should stay 7
* 7 ate 9
2024-06-22 23:16:01 +00:00
Marm
5a68c5f6d3
Explorer Redux ( #24202 )
...
* WE'RE SO BACK
* LET THERE BE SOUND
* More bugs
* fixes
* sound
* hmm
* clothing sprites + minor code changes to clothes
* meestake
* spritening
* YARR
* hiss
* Cyberiad explorer remap
* hand telover
* delta days
* rooms done
* VENDOR
* Mapping done
* Salvage mapped
* qol
* Forgot the hivelord.
* woops
* oops redux
* reviews and more
* consistency
* Update code/game/jobs/job_globals.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* character
* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/effects/spawners/random_spawners.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/hostile/pirate.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/head/job_hats.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/effects/spawners/random_spawners.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/research/designs/machine_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* some reviews
* Update code/game/machinery/constructable_frame.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* supply
* area repathing and ambience
* mapping
* metamapping
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* the doorening
* redooring
* modsuit
* more reviews
* the plasmamamninigngg
* add random salvage generation across space ruins
* add blackbox tracking for salvage sold
* gun
* deconflicts and reviews
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/head/job_hats.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/garment.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* all conversations resolved
* maybe work now?
* please no more, too many apcs
* Update code/modules/mob/living/simple_animal/corpse.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/mining/machine_vending.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/suits/misc_suits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* henri review + action figure
* Update code/game/objects/items/toys.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* PDA
* conflicts
* more conflicts
* maybe all conflcits?
* wait fuck
* maybe fixed???
* KIDAN SPRITES
* MAYBE?
* access fixes
* explorer hotfixes 1:
- fixes space pirates dying in space
- gives explorers ORM access
- box: fixes access on NTR airlock
- box: fixes naming on BS airlock
- box: adds expedition access to mail sorting room
* add salvage selling back
* NOT FOR SALE
* oh my god actually sell the fucking salvage this time
* maybe fine now?
* carpover
* NO MORE CABLE
* balance tweaks
* some depot loot updates
* merge conflict
* deconflicted???
* woops more oversights
* skirts, bombers, exploredrobe code + sprites
* woops (again)
* deconflicting
* remove old explorer room again
* Hat fix
* minor changes to sprites and code for hats
* yarrr fix 1
* first fixes
* don't drop loot from syndies gibbed by depot destruction
* add selling back with new signal based system
* speedmerge this shit
* minor changes to collars/bomber resprite
* docking port in
* ruins
* WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN
* no more murder hallway on whiteship
* undelete meson sunglasses, redelete uristrunes
* BOOTY BAGS
* don't drop ashdrake loot from crusher kills
* box: fix ntrep fax, add explorer access to ORMroom
* add meson sunglasses item icon back
* fix cere handtele, meta shutter control, death sound arg
* cleaning up
* she mosins on my russian till i dj station
* Update code/modules/clothing/head/soft_caps.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/clothing/suits/misc_suits.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/mining/machine_vending.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/game/gamemodes/game_mode.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* mapping
* Cleaning up
* revert changes in tools/{bootstrap,ci}
---------
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-05-27 19:27:59 +00:00
Mikhail Dzianishchyts
7fa44a31fb
Full Auto Gun Mode Component ( #24998 )
...
* 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 >
2024-04-22 21:32:49 +00:00
DGamerL
bad8b31afa
Changes all .len to length() where applicable ( #25174 )
...
* Globals work
* Double access works
* All other things
* Revert "All other things"
This reverts commit 6574442eb666401072+Oyu07@users.noreply.github.com >
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com >
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
2024-04-19 17:32:09 +00:00
Henri215
ec90b441ad
Moves weapons sprites out of items.dmi ( #24634 )
...
* Moves weapons sprites out of items.dmi
* lets revert this
* oversight from energy melee PR
2024-03-19 17:08:35 +00:00
Contrabang
2ec55dbfbb
Datumizes Cult. ( #24379 )
...
* 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
2024-03-16 20:36:55 +00:00
Charlie Nolan
36b202bd26
Standardize on exclaiming about committing suicide. ( #24433 )
...
* Standardize on exclaiming about committing suicide.
* Update code/game/objects/items/weapons/kitchen.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* I think this is the last of the unexciting suicides.
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-03-10 18:18:36 +00:00
warriorstar-orion
0667f20681
move all EOL comments on typepath names to dmdoc ( #23928 )
...
* move all EOL comments on typepath names to dmdoc
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-03-01 20:05:49 +00:00
DGamerL
004d7d10b7
Refactors is_hot and fixes some issues from the beaker lighting PR ( #22964 )
...
* Idk what I'm doing
* The is_hot refactor
* Fixes that I forgot to push before making the PR
* Update code/game/objects/items.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Contra review
* TODO: Find out why this isn't working
* Removes the signal stuff for now, this works
* Fixes it all
* Add new signal
* Update code/_onclick/item_attack.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Contra reivew
* Ayyy it works
* Merge master
* Forgot this one
* Update code/game/machinery/doors/airlock_types.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/structures/mineral_doors.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/turfs/simulated/floor/mineral_floors.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/turfs/simulated/walls_mineral.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-12-11 16:53:51 +00:00
Henri215
6a109ade7f
Moves a few sprites out of items.dmi ( #23301 )
...
* fuck you items.dmi
* banhammer
2023-11-24 15:39:20 +00:00
Contrabang
f3f9bd442a
Changes slot number defines from lowercase to all uppercase ( #22297 )
...
* 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
2023-10-03 18:27:51 +01:00
DGamerL
4c976a6e01
Splits up item_inhands.dmi ( #22584 )
...
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
* Fixes jackhammer and glass shard
* Fixes toy Chainsaw
* Update code/game/objects/items/toys.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/weaponry.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Fixes edagger hopefully
* Henri review
* Oops
* First this gone, and now the pain
* Should all be fixed now
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-01 11:47:25 +01:00
Luc
327add6348
Converts two-handedness/wielding to a component ( #21619 )
...
* initial checkin
* Add everything but maps
* update paths
* Patches some minor bugs across twohanded things
* remove a stowaway
* Update code/__DEFINES/dcs/signals.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Contra review
* Fix kc
* hopefully fix file perms
* Fix file perms
* revert line-endings
* uh?
* Trying once again to fix file formats
* henri review 1
* henri review 2
* update from master
* Removes override that breaks modsuits
* re-add reference
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-09-01 22:06:59 +01:00
Qwertytoforty
04e1792d0d
Dswords now return melee attack on parry. Eswords reflect lasers on parry. Throwing bodies at a dsword user may not work well ( #21463 )
2023-07-01 10:42:44 +02:00
DGamerL
173bfb92f5
Removes bio resist from the code ( #21108 )
...
* BIO armor is kill
* some more stuff that uses bio resist
* I did a scuffed merge conflict solve but it works
2023-06-03 09:50:22 +01:00
Qwertytoforty
ce78b11870
gives spellblade with lightning grant the user shock immunity ( #20949 )
...
* gives spellblade with lightning grant the user shock immunity
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/game/objects/items/weapons/melee/melee_misc.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2023-05-02 21:59:21 +02:00
GDN
5557f6ae32
Nukes detailed examine ( #20314 )
...
* Nukes detailed examine, converts to normal examine stuff
* THE SHOOTENING
* Update code/game/objects/structures/grille.dm
Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com >
* oop
* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/power/apc/apc.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/projectiles/guns/energy/nuclear.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* bam
---------
Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2023-03-17 16:20:53 -05:00
GDN
626d2754d5
objective items being destroyed are now logged ( #20485 )
...
* objective items being destroyed is now logged
* signal time
* oop
* Update code/modules/projectiles/guns/energy/laser.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Update code/game/objects/items/documents.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* mira review
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-03-08 20:15:16 +01:00
AffectedArc07
b34e8fa301
[READY] CI now bans files with the same name ( #20195 )
...
* CI now bans files with the same name
* Part 1
* Warriorstar python tweaks
* Part Deux
* Fix unticked
* fix
2023-02-04 16:33:41 -06:00
