204f7985c4
[FIX] [IDB Ignore] Closet emag sparks disappear again ( #27126 )
...
* Spark overlay now disappears again
* Icondifbott no diffing!
---------
Co-authored-by: Adrer <adrermail@gmail.com >
2024-10-17 11:08:48 +00:00
388c02beec
[FIX] Changes the engineering locker sprite to be correct ( #27109 )
...
* Changes the engi closet sprite to the right one
* Wrong name
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-10-15 15:32:34 +00:00
4cef80facb
[FIX] Guncabinet overlay fix ( #27107 )
...
* Draw guns before the doors
* Added a comment.
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-10-15 12:30:33 +00:00
429bebc613
[FIX] Animated closet fixes ( #27102 )
...
* Some animated closet fixes
* Trailing newline
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-10-15 01:09:04 +00:00
b51cc0f31c
[PORT/FEATURE] Animated closet doors ( #26832 )
...
* Adds animated closets
* Remove unecessary icon states and fixes secure closets
* Actually fixes secure closets
* Please our linting overlords.
* Fixes non-crate subtypes
* Update code/game/objects/structures/crates_lockers/closets.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Chap <erwin@lombok.demon.nl >
* Moved legacy closet icons to seperate file
* Remove some unused variables
* GC
* Moved to proper destroy
* It's good when code compiles
---------
Signed-off-by: Chap <erwin@lombok.demon.nl >
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-10-14 14:05:16 +00:00
46887a37f9
Thurible - Holy Incense Burner ( #26713 )
...
* Thurible Code
* No Belt Slot
* No more emag act.
* Unholy water corruption fix
* Added jestosterone and nothing to acceptable reagents. Honk
* Item sprites
* Better bad chem purge messages
* Inhand Sprites
* Variable Format
* Formatting, Visible Messages, Inhand Updating
* Removed extraneous check
* Loc fix
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Readability of reagents var
* Guard clause on corrupted reagent addition
* Moved container type to vars
* Better check for sprite update
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-10-10 09:46:26 +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
55a8675cc5
Paradise's soul removal part 7.25: firesuits, radsuits, workboots and all magboots ( #26671 )
...
* Firefighter suit, atmos firesuit and radiation suit resprite
* Atmospherics firefighter helmet and radiation hood resprite
* Magboots resprite
* Workboots resprite
* Removes old firesuit, hardhat, radsuit and radhood sprites
* Deconflict
* Deconflict 2
* Very slight syndicate magboots adjustment
* Inhands, suggestions and icon renames
* Unused heavy firesuit removal
* Sprites for new kidan
2024-09-23 21:53:45 +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
4919445067
feat: Add genetics cube lockers. ( #26547 )
2024-08-25 16:41:17 +00:00
3fd78491e6
Moving while buckled or while in a locker that is locked / welded will no longer reset resist timer. ( #26523 )
...
* Moving while buckled to a surface will no longer reset the timer / cause you to fail.
* Properly applies the same principal to closets and secure lockers.
* Changes break out time to use the MINUTES define.
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
---------
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-08-24 16:43: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
e8eabf3014
Pimp coat ( #26122 )
...
* mob sprites
* imcoder
* i am too tired to name these commits
* woof
* who let the dogs out?
* 3 > 1
* i hate git
2024-07-02 17:53:16 +00:00
68635765b2
Adds a healthhud and securityhud to Captain's garment and crew monitor to Blueshield's locker. ( #25982 )
2024-06-29 18:00:25 +00:00
7df5e186a0
Beacons are no longer radios ( #25559 )
...
* lets goooo
* name change
* yes
* dgamer review
* Update code/modules/projectiles/projectile/special_projectiles.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-12 18:00:08 +00:00
90c7d9bb93
Completely Purges Any Suggestion That The IAA is a Lawyer. ( #25371 )
...
* 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
* The IAA is not a lawyer. They were never a lawyer. Glory to INGSO- uhh, NANOTRASEN!
* There was lawyer stuff on the maps.
* crush
* Update code/modules/pda/pdas.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update pda.dmi
* Update code/modules/clothing/under/accessories/accessory.dm
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Fordoxia <fordoxia@googlemail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-06-12 17:55:45 +00:00
0db4c22804
Cargo Technician resprite + some hazard vests ( #25399 )
...
* cargotech and hazard vests
* deliveryboy and bomberjacket
* explorer merge changes
2024-05-29 13:40:08 +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
d587effe2c
Beret + softcap .dmi split ( #25314 )
...
* beret softcap dmi split
* icon rename
* dme crlf to lf
* tsf cap fixes
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com >
* vox cap icon name
* remove beret subtype on fluff
* Update code/modules/clothing/head/soft_caps.dm
Co-authored-by: Henri215 <77684085+Henri215@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: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-05-02 11:37:44 +00:00
6a3da2726d
Increases security of CC armory ( #24414 )
...
* Increase CC Security
* henri review
* button replaced and improved
* requested changes
* Secures CC armory (typo-free edition)
* final code edit, map review
2024-04-12 18:23:19 +00:00
34ba019704
Adds more descriptions to missing items and changes some ( #24584 )
...
* jesus fuck thats a lot of descs
* Apply suggestions from code review
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* review
* christa review
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
---------
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
2024-04-07 09:44:27 +00:00
1b064b8f36
Temp cell secure lockers now spawn empty. ( #24675 )
...
* Adds empty tempcell lockers with cell-specific subtypes
* Maps in the tempcell lockers
* I ctrl-z'ed when changing the desctiption, go me
* Fix typo - thank you grammer team
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-04-03 14:08:51 +00:00
5c24d2be90
... ( #24762 )
2024-03-29 14:53:05 +00:00
93d9c70530
Adds the Detective Holobarrier Projector + Chalk ( #24400 )
...
* just one more thing
* gosh that was embarassing
* Update code/game/objects/items/crayons.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/items/weapons/holosign_projector.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/items/weapons/holosign_projector.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
2024-03-11 13:17:34 -04: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
a268af22ef
Puts evidence secure lockers in evidence room in brig on Cerestation, delta, meta and on box station ( #24037 )
...
* Secure lockers
* guh random APC
* secure safes
* fixed a issue
* Update security_lockers.dm
* Secure evidence lockers
* Update security_lockers.dm
* Update code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Update security_lockers.dm
* evidence lockers for the dective
* fixed a funny error
* fixed a few issues
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-02-13 19:17:28 +00:00
c398e4a617
Adds 2 cybernetic implants, makes emag_act return TRUE ( #23876 )
...
* Adds 2 cybernetic implants, makes emag_act return TRUE
* the rest of the fucking owl
* yeah that would do it
* remove this
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* request changes, scaling burn damage, 3 tile range, lowers tech level
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/crates.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update scanners.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Lewcs good to them?
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* fuck me
* there are no message admins in ba-sing
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-02-08 12:52:11 +00:00
3c5cb36e81
Adds Construction Bag ( #24067 )
...
* imagine actually building things?
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-02-08 12:50:40 +00:00
4237f77be1
Fixing a few grammar issues ( #23842 )
...
* fixing some typos and spacings
* another one
* not that one
* even more
2024-01-25 11:44:38 -06:00
391f296ed9
Knuckledusters; New Ways to Beat People to Death in Style ( #23685 )
...
* Created Knuckledusters.dm
Time to see if this shit works
* Correct file now
I forgot to add .dm after making file. Oopsies.
* Delete code/game/objects/items/weapons/knuckledusters
Wrong file
* Fixes code and addes sprites
* Finished sprites, dusters can now be gotten
* Tweaks and fixes and additions
* Uplink description tweak
* Now they do more, thanks Snowball for help
* Syndiedusters look good now
* Tweaked values, added Engraved Dusters as steal objective
* Further tweak
* Removal of unnecessary space
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Tweaks from Henri added
* Gave admin variant new root name
* Autodocumentation of variables
I feel like an idiot not knowing how to autodocument, but feeling like an idiot is worth it so long as I learn
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Added some suggested changes/code cleaning
* Removes unecessary space, how do I keep missing these?
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-01-21 21:03:46 +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
95c46662c5
Entertainer Drip (Mime/Clown) ( #23546 )
...
* entertainerdrip
* duffelshadingitem
2023-12-28 22:39:36 +00:00
e5910559a6
Adds robotics bags. ( #23433 )
...
* I present: bags! wowie...
* oops
* this should fix pierre
* changes
* forgor
2023-12-11 16:58:59 +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
35754c77ea
Verb cleanup ( #22224 )
...
* Verb cleanup
* rest of the object verbs
* little more object cleanup
* more changes
* last of it
* this too
* tgui
* code review
* time to go
2023-11-12 20:19:17 +00:00
f65d120711
Nerfs the basic plasma cutter. Yep. ( #23071 )
...
* Who would ever expect a basic cutter nerf?
* temporary paramedic fix - they get a drill
2023-11-12 20:11:34 +00:00
eed4890be5
white beret ( #23013 )
2023-10-27 20:19:45 +01:00
2f173c48c2
Added extra items to RD garment bag ( #22916 )
...
* Added Extra Cloth
* added SRC to beret
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Empty-Commit
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-10-26 10:42:10 +01:00
d3ea6b2620
Remaps the Lavaland Outpost. Again. ( #22391 )
...
* a remap begins...
* tweaks
* bye-bye, QM's handheld crew monitor
* brings back the abandoned crate
* oop
* more tweaks
* tcomm pipes
* brad update
* more firelocks
* more windows
* tweaks
* denth review part 1
* renaming doors
* crowbars
* changes walls, new locker
* Oyu's review
* more tweaks
* signs
* MAYBE will be deconflicted
* now deconfllicted hopefully
* some more tweaks
* no more wall helpers!
* fluff
* IDs for polarized windows
* slight tweaks to firelocks
* added grilles
* more tweaks
* tiny lil maint update
* more maint tweaks
* maint rework part 3
* oopsie
* jani has dark floors now
* reworked robotics, gave brad more love
* stationary defibs
* stuff
* bug fix
* more tweaks
* aaaaa
* Revert "aaaaa"
This reverts commit f70ba3a89a77684085+Henri215@users.noreply.github.com >
* renames access
* shuttle decorations + other tweaks
* oopsie
* bjam's reviews
* split the QM's locker
Exa's approval, rest of design team did not share opinions
* OH UH
* this too
* this is a better way to do it actually
* sean review + floodlight subtype
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-21 21:30:28 +01:00
d5af86dee4
Updated HOP and QM cartridge and added new supply cartridge. ( #22464 )
...
* Updated HOP and QM cartridge and mapped instances
* Updated descriptions and apps
* Update code/modules/pda/cart.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/pda/cart.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/pda/cart.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/modules/pda/cart.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Adrer <adrermail@gmail.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-10-17 20:12:36 +01:00
8341915cdd
Swaps Atmos Tray scanners with engineering goggles ( #22713 )
...
* I am tired of hallucinations
* Trays in vendor
2023-10-09 20:42:56 +01:00
5e8536871b
Cargo QOL + Mail Bag Fix ( #22500 )
...
* aaaaaa
I forgot
* mailn't
Removes QOL.
2023-09-19 21:09:57 -04:00
1465e5d4d3
Robodrobe and Robotics Lockers resprite ( #22425 )
...
* uniqueness
* tweak for robodrobe
2023-09-17 23:59:39 +01:00
30dacc03e3
Adds crutches ( #21959 )
...
* crutches!
* comment update
* henri review
* comment tweak
* in-hands updated
* i can spell
* two handed component
* unfuck this file
* oh lord map changes
* make the placing a little more reasonable...
* changes to cyberiad
2023-09-11 12:50:05 -05:00
e59f0e8aea
Makes the Quartermaster a Head of Staff ( #22133 )
...
* remote
* more additions
* tgui + ssu
* map edits
* Shut your mug
More changes, huds, mugs and icons.
* mug time
* aaaa
* fixes cere edits
* should fix it
* Update tgui/packages/tgui/interfaces/common/CrewManifest.js
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/game/machinery/suit_storage_unit.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Revert "Update tgui/packages/tgui/interfaces/common/CrewManifest.js"
This reverts commit 5de07cba5877684085+Henri215@users.noreply.github.com >
* Mr QM's Wild Ride
Resolves a number of review comments, including preventing the QM slot being altered by the B/E event, adds a flash to the locker and reverts removal of basic cargo access from the HOP.
* Forgot a var name change, I'm gonna cry edition.
Renames name to board_name for supply ID computer.
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* genesis 1:3
Alters light_color of supply management console to brown_orange from light_color_red
* Update code/modules/events/bureaucratic_error.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* another misplaced comma
Removes a comms where there should not be one.
* saving private ryan
Removes plasmacutter, adds mining GPS and crew monitor to QM locker contents.
* redone map changes
* oop
* the last of it
* merge time
---------
Co-authored-by: GDN <Roanrichards1@Gmail.com >
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-09-10 20:53:05 +01:00
2d455a4cbf
aint this kinda funny? ( #22139 )
2023-09-07 10:53:16 +01:00
7336750e48
Paramedic QOL - Lavaland Edition ( #22154 )
...
* paramedic grindset
Adds Paramedic headset with associated encryption key. Gives Paramedic mining access+supply comms. Adds Lavaland corpse related recovery equipment to Paramedic locker.
* goodbye soul hello garment bags
Adds a Paramedic garment bag. Cuts back on Paramedic locker clutter by adding crew monitor and crew pinpointer to loadout.
* headset, i barely know her
Paramedic headset moved out of garment bag and into main locker.
* lore???
Turns out I've been spelling Nanotrasen wrong all this time.
* Update code/game/objects/items/devices/radio/headset.dm
Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com >
---------
Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com >
2023-09-01 23:19:41 +01:00
6aefc3fa12
VIP lockers now get more spare gear. ( #21957 )
...
* VIP lockers now get more gear
* all three bags
2023-09-01 23:03:10 +01:00
Chap