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
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
fb199c82b9
fixes saber spelling ( #26766 )
2024-09-19 02:26:03 +00:00
024af9c248
Removes tech levels from high risk items ( #26725 )
2024-09-16 03:28:49 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
Paul