9225cd5817
Security belts tweak ( #26754 )
...
* Tweaking sec belts
* Update code/game/objects/items/weapons/storage/belt.dm
Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com >
---------
Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Sean <12197162+S34NW@users.noreply.github.com >
2024-10-10 09:57:12 +00:00
a5a199392b
Tweak: Revision of miners' and explorers' gear. ( #26525 )
...
* Tweak: Revision of miners' and explorers' gear.
* Remove drake changes
* Remove armor-related changes
* Update machine_vending.dm
* Update machine_vending.dm
2024-10-10 09:44:02 +00:00
603d71710d
Makes the BRPD fit in belts ( #26911 )
...
* Makes the BRPD fit in belts
* Also military belt
2024-10-01 17:15:48 +00:00
fb199c82b9
fixes saber spelling ( #26766 )
2024-09-19 02:26:03 +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
d0be6edeb3
Fix missing icon for Stack Craft ( #26491 )
2024-08-17 23:33:51 +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
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
098b13bb33
Removes the empty type of /snacks ( #26010 )
...
* Aaaaa it works
* Add updatepaths
* Add unsaved files
* MATTTTT
* Fixes casino
* Fix
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-29 14:46:04 +00:00
05784b78bd
bluespace belt handheld defibs now ( #25665 )
2024-05-31 15:27:16 +00:00
f1838b83e9
[FIX] My webbings, where are they? ( #25570 )
...
* Changes necrosis_prob to use decaylevel.
* Reverts previous change to create a new branch.
* Reverts (https://github.com/ParadiseSS13/Paradise/pull/24667 )
* Does not revert the previous PR, it builds upon it. Allowing items on the belt slot with the "special" var set to TRUE to overlay suits.
Judo Belt, Webbings, and Bandolier are the current selection.
* Fully fleshes out the layering of special belts.
* Adds more belts to the special layer.
* Fixes an oversight with the captain's rapier being left out. 😭
* Fixes a few more oversights caused by a pull/fetch.
* Moves around an if statement to fix the order of operations, which was causing items that should've been OVER the suit item to be appear UNDER it.
* Should resolve the merge conflict.
* Partial revert
* Merge conflict resolution
* Refactors how a 'special belt' is defined and handled. Makes it more readable.
* renames all instances of `special` to `layer_over_suit`
2024-05-30 12:14:34 +00:00
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
66e3528b7c
Adds Abductor Janitorial Tools! ( #25057 )
...
* 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
* Out of this world cleaning!
* missing empty space
* Locker belt
* fix merge conflict and upgrade belt
* Update code/modules/research/designs/mechfabricator_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/research/designs/medical_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update medical_designs.dm
* Update code/game/objects/items/robot/robot_upgrades.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/abduction/abduction_gear.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Fixed missing item state
* Begone, bucket!
* Update code/game/objects/structures/mop_bucket.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@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: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-05-17 11:22:14 +00:00
19c0b70171
Slightly refactors storage item insertion ( #24429 )
...
* everything is on fire
* silent trait check
* how did it even become CRLF
* minor formatting
* fix icon updating and adds silent insertion to global trait list
* adds the new parameter to documentation - whoops!
* pain
* contra review
* contra review again, reduces amount of checks for user in the loops
---------
Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com >
2024-03-24 18:41:07 +00:00
0d27af414c
Adds the Organ Extractor ( #24100 )
...
* Adds the Syndicate Organ Extractor
* ipc moment
* fix bug, prevents putting organs in dead bodies to extract
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* renames sprite
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* replace xx yy
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-03-20 20:10:53 +00:00
ad74916094
woops ( #24620 )
2024-03-14 18:33:56 +00:00
3557748229
People are now hidden behind smoke ( #24229 )
...
* no, that is NOT solid snake
* lol
* more names
* Update code/game/objects/items/weapons/storage/boxes.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 >
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-03-11 14:13:59 -04:00
87a318a7de
Refactors screen objects to /atom/movable ( #24068 )
...
* introduce helper + remove unused proc
* we love compatibility
* Update code/_onclick/hud/action_button.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/action_button.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/alert.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/blob_overmind.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/blob_overmind.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/blob_overmind.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/martial_arts/martial.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/mining/lavaland/loot/tendril_loot.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/mob/living/carbon/human/species/shadow.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/mob/living/carbon/human/species/shadow.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/mob/living/living_update_status.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/screen_objects.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/screen_objects.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/hud/screen_objects.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/internal.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/machinery/computer/camera_advanced.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/machinery/computer/camera_advanced.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/internal.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/mecha/mecha.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* deconflict
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-03-03 17:37:51 +00:00
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
805d6acb71
Sleight of Hand, a Bartender Ability ( #23234 )
...
* the start
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* pain
* ITS STILL A WIP
* dones
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* oh god, this was just a draft, it should be part of the PR
* we dont need this anymore either
* sirrayan request
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* DGL's review
* more of DLG's review
* removes bar judo
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-03-01 13:10:53 +00:00
97cfc533b2
Allows toolbelts to hold nanopaste and cyborg analyzers. ( #24051 )
...
* Update belt.dm
Store nanopaste in toolbelts.
* Update belt.dm
can hold cyborg analyzers too!
2024-02-14 19:43:52 +00:00
db578cdc6f
Makes food not a subtype of reagent holders ( #23379 )
...
* I am suffering
* Alright this should be all now
* Fixes CI
* I hate the online merge resolver.
* This got lost in the merge master
* Updatepaths fixed + new added
* Contra review
* Fixes desserts
* Oops
* This should fix it
* Maybe?
* Attempt 3
* Missed conflict
* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/food/foods/pizza.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Fixes grinders
* Adds comment
* Warrior review
* Warrior + Sirryan review
* Update code/modules/food_and_drinks/food_base.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-01-21 19:00:02 +00:00
57e8de23ee
Buffs syndicate bundles. ( #23479 )
...
* Woooo
* I forgor
* Changed
* Agent gets thermals again
* Adds back suppressor to agent
* Removes methdonks from metroid
* Update code/game/objects/items/weapons/grenades/syndieminibomb.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Moves the AI detector to the belt
* Goodbye Donks
* Fuck it ship it (Fixes CI and makes the pen more noticeable)
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-12-11 18:04:15 +00:00
a5555a87eb
Tools now fit in all versions of the military belt ( #23428 )
...
* Tools now fit in all milbelts
* comments
* consistency
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-12-11 16:58:38 +00:00
307120e7d3
Patches and pills are now no longer subtypes of food ( #23063 )
...
* Part 2 - feeding others doesn't work as intended
* Part 3: fixing force feeding
* Fixes patches being wack
* Makes this less ass
* Adds patches to the chemistry bag
* Update code/modules/mob/living/carbon/carbon.dm
* Update code/modules/mob/living/carbon/carbon.dm
* Some missed patches
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Fixes IPC logic
* Henri Review
* Add updatepaths
* Jimkil review
* IPCs now aren't allowed to eat pills and get patch
* Update code/modules/mob/living/carbon/carbon.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/patch.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/mob/living/carbon/carbon.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2023-11-21 15:37:16 +00:00
d3f85c6b67
Adds a new loadout to wizard: Fireball. ( #23115 )
...
* just fireball.
* requested changes
* review
* Apply suggestions from code review
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* review
* oops
---------
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
2023-11-08 08:52:48 +00:00
e6addfc6ac
Belts and some select belt slot items no longer require a jumpsuit to wear ( #23038 )
...
* Why wear clothes when you can wear belts?
* Converted the ignore_under var into a flag
2023-11-04 16:37:01 -04:00
5f38561464
Janitorial ERT rekit/buff and a few additions for the jani ert squad. ( #22913 )
...
* jani ert buffs yummy
* yipiee
* beh
* Bruzah and DGL review
* Update ert_outfits.dm
2023-10-29 10:19:08 +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
3693e6d620
Epi autoinjectors are now a subtype of autoinjectors, the basetype is now empty ( #22261 )
...
* removing the useless feature
Yes this removes it from all autoinjectors
No I am not going to publish this
* WOOOOO REGEX WORKS
* Almost forgot the entire reason of this PR
* Oversight
* Update code/modules/reagents/reagent_containers/hypospray.dm
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/hypospray.dm
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
* Lewc review
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-09-17 20:15:43 -04:00
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
dd9079aa1a
Adds Cargo Office Access to JaniKeyring + Fits in JaniBelt ( #21471 )
...
* oopsies
* oops here's another fix
2023-07-07 13:41:54 +01:00
49b26c4eba
WT Rework and Nerf ( #20536 )
...
* Reworks and nerfs WTs
* Removes some duplicate comments
* Makes WT ammo box's normal sized items because I forgot to at first
* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once
* Sanity checks work properly now
* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Magazines fit in security webbings
* I forgot a comma
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Applying various reviewer suggestions
* Applies various suggestions
* removes moving_do_after now that its a param
* Apply suggestions from code review
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* solves the merge conflict hopefully
* step one of trying to fix conflict again
* step two hopefully fixes conflict
* Delete ammo.dmi
* Merge branch 'master' into wt-rework
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Applying various reviewer suggestions
* Revert "Applying various reviewer suggestions"
This reverts commit 7081e9aa2b96dab4f8b86906a6765477684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2023-05-25 18:41:56 +02:00
db2aac4c1b
im a silly goose ( #21005 )
2023-05-02 22:10:33 +02:00
a5efbd32e8
USSP update part 2 ( #20926 )
...
* USSP part 2
* swapping old version for new one in some places
2023-05-02 21:59:01 +02:00
fc87927f7b
Tool Size Tweaks ( #20586 )
...
* The Great Toolening
* oops all belts (incoming self conflict lul)
* defines shouldnt lie
* mini crowbar TODOs
* beeeeeeeeeg crowbar
* oops it needs a design
* purple kit + vendor fix
* add mini crowbar dmi
* oops forgot this
* i am an idiot sandwhich
* im bad at code
* scratch that, i cant read my VSC
* wrench undo + readd to boxes
* nukies too
* man i cant code
* power tools should logically follow
* formatting
* maybe im free?
* forgot inhands
* Update toolbox.dm
* bluespace belt buff (unironic)
* undo for now
* fixes bluespace/tot belts + adds w_class override
* adds small crowbar to e-toolboxes and tot tools
* power tool fix
* Rnd build path
Co-authored-by: Adrer <erwin@lombok.demon.nl >
* design fix
* merge conflict + small fix
* small name fixes
---------
Co-authored-by: Adrer <erwin@lombok.demon.nl >
2023-05-02 21:43:06 +02:00
ca6717c0a4
Full Belts No Longer Fit in Bags ( #20547 )
...
* The Beltening
* Antag Belt Buffs
* This needs some sanity work, it is currently non-functional
* it finally works
* fix spawn bug + bluespace/laz belts
* comments moment
* im silly + autodoc
* just in case tm
* grammar
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* better coding practices are fun
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* sane code, thanks sirryan
* better coding practices
* review fixes
* bluespace bag fix
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-05-02 21:19:02 +02:00
5c9d20f65f
Ports the Bluespace Light Replacer from BeeStation ( #20545 )
...
* Ports the Bluespace Light Replacer from BeeStation
* advanced replacer for janitor ERT
* wrong place
* Preventing it from being used over cameras
* Update code/game/objects/items/devices/lightreplacer.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
* bluespace replacer only for gamma
---------
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2023-03-22 22:22:19 -05:00
77b554b73e
Deluxe soap for ERT ( #20346 )
...
* Elite soap for the best
* Reverting janiborg soap
2023-03-04 09:39:18 +01:00
1ce593b9a2
Ports TG push broom ( #20367 )
...
* Ports TG push broom
* Update code/game/objects/items/weapons/twohanded.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Lewc review and twohanded autodoc
* Steelslayer review
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2023-02-25 12:15:21 -06:00
fba3664c5a
rubbah ( #20339 )
2023-02-06 16:04:39 +00:00
c4667311e7
Janitorial equipment tweaks and cleaners availability ( #20037 )
...
* Janitorial equipment tweaks and advanced cleaner
* cleaner availability tweaks
* old cleaner for drones
* Mop capacity buff
* advanced cleaner for sol traders
* conflict part 1
* Merge branch 'master' into janitorial_tweaks
* Revert "Merge branch 'master' into janitorial_tweaks"
This reverts commit 47129ea819a8c520b069
2023-02-03 13:10:51 -06:00
4ebeb526de
Update belt.dm ( #20090 )
2023-01-07 19:56:13 +00:00
72ee2f2488
fixes null belt icons ( #19748 )
2022-11-25 22:51:05 -06:00
765d966592
Secbelt and detective ( #19666 )
...
* scanner added
* fixed comma
2022-11-18 17:45:18 +00:00
c8edc8c240
Syndi Bundle Rework ( #19352 )
...
* Syndi Bundle Rework
* Revised bundles based on feedback
* Reworked operative into grenadier
* Corrected payday value
2022-10-26 00:19:56 +01:00
1f2b29bd80
style changes ( #18964 )
2022-09-07 13:39:23 +01:00
949b73acf2
goodbye noobtrap ( #18469 )
2022-07-21 14:02:40 +01:00
f4b37b4177
Port TG updating appearances ( #17943 )
...
* Get pants that match or else you gonna look silly yo
* Posters
* Fix other hud elements
* Rereviewed
* Update shotglass.dm
* Fix for new merged PRs
* Typo
* Coming across other stuff
* Update theblob.dm
* No takebacksies
* smh i forget to leave a comment
* Updated for the detgun and cards
* Should have rerun langserver again
* No longer plastic, more in scope
* Damn you bluespace
* Reverting turret logic, out of scope at this point
* Tweak that part
* Went over energy guns again, and fixed UI White's sprite sheet
* Welding masks, glasses, and JUSTICE
* Update portable_atmospherics.dm
* Cleaning up, clearing things up
* Review and suggestions
* Update valve.dm
* More tweaks
* Missing character
* Not distinct lightmasks, so they can be overlays
* Update generator.dm
* Add parameter so holodeck doesn't try to make a perfect copy
* Update unsorted.dm
* Spiders
* Better fix for spiders, fix vamps too
* Ghosts
* Update telekinesis.dm
* Cleaning up old procs
* It's set up to not copy datums... Unless they're in a list
* Donuts, duct tape, and detgun. D3VR coming to Early Access
* Update procs that interact with doors so they call update_state instead
* Forgot one spot, and actually might as well just force lock
* Cleaning up other things... Sigh, and kitty ears
* oops
* Getting used to how it works
* blinds
* Going back to the suit obscuring thing, so it doesn't update all the time
* Missed that from merging master
* I made this PR and forgot about it
* Fix runtimes in cards
* Make things a bit more unified
* Update update_icons.dm
* yarn, really?
* Update library_equipment.dm
* Update shieldgen.dm
* Every time Charlie merges something, I go back and see if I can improve things further
* what's this? more?
* Update misc_special.dm
* wow, paper
* Review
* More reviews
* To be sure, seems like being broken messed something sometimes
* Brought airlocks closer to how TG works to iron out some stuff
* Pizza and morgue
* Doesn't seem to hurt, tried with holodeck
* Revert "Doesn't seem to hurt, tried with holodeck"
This reverts commit 158529302b
2022-07-21 08:11:59 +02:00
490de764de
colored belt cables ( #18303 )
...
😎
2022-07-14 16:52:35 +01:00
kyunkyunkyun