0973879763
save progress ( #26976 )
2024-10-15 00:55:41 +00:00
d916254cc6
quick easy .dmi fix ( #27077 )
2024-10-14 15:10:11 +00:00
c15a5bbf59
Fixes invisible signs on mining shelters ( #27073 )
2024-10-14 15:05:50 +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
ed8809a4fc
Fixes Soviet Mobs being Invisible ( #27064 )
...
* i feex
* statue
2024-10-12 11:26:24 +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
413ddc8b73
Adds Floor Lights (and makes lights not have random ranges) ( #26923 )
...
* Adds Floor Lights
* undef
* remove TECHNICAL DEBT™
* remove more technical debt™
* mapping changes
2024-10-06 09:33:31 +00:00
19e1268f0f
Cavity Time! - Ports 46 Desserts from TG ( #26540 )
...
* recipe paths
* splits frozen deserts
* d320b129f891113370+Contrabang@users.noreply.github.com >
Signed-off-by: Mitchs98 <mitchs98@gmail.com >
* yogurt, but for real this time.
---------
Signed-off-by: Mitchs98 <mitchs98@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-10-03 18:32:16 +00:00
b61f4f3ff8
feat: Storage shelves and gun racks. ( #26744 )
...
* feat: Storage shelves and gun racks.
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* review comments
* better examine
* fix lint
* Examine for empty shelves
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* rest of review comments
---------
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-09-28 22:28:44 +00:00
1896ed9fd8
Tweaks Derelict Facility ruin loot and adds a new item ( #26517 )
...
* part 1
* no you don't
* Update code/modules/mining/equipment/wormhole_jaunter.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
* Update code/game/objects/items/devices/radio/beacon.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
* Update code/modules/awaymissions/mission_code/ruins/deepstorage.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
* spawner update
* Update code/modules/mining/equipment/wormhole_jaunter.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
* Update code/modules/mining/equipment/wormhole_jaunter.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
* Update code/modules/mining/equipment/wormhole_jaunter.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
* Update code/modules/mining/equipment/wormhole_jaunter.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
* Forgotten main reward
* many things were forgotten
---------
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-09-26 10:04:41 +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
a135a9d10e
[FIX] Bottles created in the chemmaster now use the right chemical overlay. ( #26800 )
...
* Move everything a pixel over
* configure item before reagent transfer
---------
Co-authored-by: Adrer <adrermail@gmail.com >
2024-09-19 10:32:11 +00:00
fb199c82b9
fixes saber spelling ( #26766 )
2024-09-19 02:26:03 +00:00
e2a7c805dd
Paradise's soul removal part 7: engineering jumpsuits and accessories ( #26641 )
...
* Engineering jumpsuit resprite/refresh
* Engineering berets resprite/refresh
* CE mantle resprite
* Grey CE pants consistency fix
2024-09-14 07:01:30 +00:00
e5712559bf
Fixes missing Unanchored Gas Meter Item sprite ( #26767 )
...
* Deletes old meter icon
I HATE SPRITES THAT ARENT WITH THE REST OF THEM
* Resprites GAS METER (Fixes unchanged icon)
Hidden secret gas meter that isnt with every other gas meter
2024-09-14 06:02:10 +00:00
32719e2f99
Adds map: EmeraldStation (NSS Diagoras) ( #26438 )
...
* fleshed out engi and asteroid
* command work
* more department fleshing out: sec
* sec work
* perma work
* Update EmeraldStation.dmm
* Update EmeraldStation.dmm
* Update EmeraldStation.dmm
* Update EmeraldStation.dmm
* med and dorms fleshing out
* sci and service fleshing out
* Update EmeraldStation.dmm
* APCs done + detailing
* Update EmeraldStation.dmm
* wire work
* more wire work
* wires and LIGHTS
* ATMOS DONE now onto DECOR
* AI/status monitors
* intercoms and newscasters
* Wall items and cameras!
* Update EmeraldStation.dmm
* Update EmeraldStation.dmm
* Update EmeraldStation.dmm
* Update EmeraldStation.dmm
* Update EmeraldStation.dmm
* moved the file to the correct area
* bugfixes, starting up the map
* refining the asteroid
* merge fixes
* logs of bugstomping
* more bugfixing
* bugfixing
* bugfixin
* trying to make the stupid lava work
* adds plasma vent for test
* more testing
* swapped file places
* vents work now!
* Update paradise.dme
* vent sprite update
* file corrections
* Asteroid MILLA changes
* adds a new MILLA atmos type
* Build MILLA
* oopsie
* fixes
* removed testing code
* reverts map start
* reverts the atmos change
* respriting geyser
* comments
* Update code/__DEFINES/atmospherics_defines.dm
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update geyser.dmi
* Update paradise.dme
* fixing past merges
* adds some missing items from merges
* reverting
* reverts changes again
* deleted unused file
* oops forgot nearspace areas
* Update code/game/objects/structures/plasma_geyser.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/turfs/simulated/floor/lava.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/area/ss13_areas/engineering_areas.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/structures/plasma_geyser.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/turfs/simulated/floor/lava.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/structures/plasma_geyser.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Lots of map fixes
* Update EmeraldStation.dmm
* trying to unfuck the milla merge
* removed station from dme
* fixes/small tweaks/suggested changes
* removed errant turret
* redid telecomms
* Update EmeraldStation.dmm
* rebuilding everything
* redoing security
* more sec work
* perma shaped up + more items
* renamed properly this time
* resetting atmos code
* more secwork and move papers off varedits
* more secwork + dorms + funeral services
* added new areas + pipe/wires/floors
* security electrified windows/wires/alarms/lights
* cameras, dorms pipes/ires/alarms/apcs
* merged
* disposals
* lots of wall things + added map datum for testing
* pipe fix for linter
* fiddled with maints
* minor maint edits
* fixes + maint work
* more bugfix
* even more bugfixing
* MORE nearspace fixing
* dumb nearspace fix
* Update code/game/objects/structures/plasma_geyser.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* a LOT of fixes + door access
* disposal pipe update script
* oops linter fixes
* fixed viro button runtime
* finished maints + space decor
* removed hall light switches
* fixed solars areas
* removed errant lattice
* remove agent B from asteroid
* wall bump placement refining
* apc fix
* bugfixing
* minor maint change
* bugfixing
* burn tile on node fix
* changed official name
* bugfixing
* added genetics locker+figures
* bug hunting (buttons mostly)
* added firelocks. oops
* added temp webmap + bugfix
* Update emeraldstation.dmm
* new webmap. again
* added the perma tools
* nanomaps
* bug fixes, fixes, and more fixes
* more tweaks
* cable fix
* more bugfixing
* Update emeraldstation.dmm
* tiny fix
* fix AI sat turrets
* more bugfixing
* MORE bugfixing
* bugfix + ruins soundfile
* pipe bugfix
* fixed toxins pipes. junctions bad?
* swimwear :)
* remove errant QM gps
* rnd shutter button missing
* potato layering fix
* add bridge request console
* fix window tint in interrogation
* added some clothes
* nanomaps2, asset boogaloo
* modified an empty hall, added some perma cams, minor fixed
* forgot to save before push oops
* widens sci maint hall + bugfix
* gives theatre its autodrobe back!
* moved borg spawns
* moves nuke op default spot
* new asteroid mix + botany tweak
* adds cremator button
* new sign + moved pod + bugfixing
* cable fix
* engine, sci chem, and surgery tweaks
* more bugfixes and tweaks
* more tweaks
* adds a few windows back to robotics
* bar was missing pun pun!
* corrected misplaced atmos machines
* re-added the bathroom
* fixes atmos waste disposal injector
* modified mr potato
* changed bathroom area
* minor toxins tweak
* small wall decor tweaks
* removes errant lights
* removes errant opier
* LOTS of fixes/tweaks + adds CO2 to asteroid
* gave maint some boxes + cable fix
* duped brig lock
* adds masks to medbay storage
* adds missing gues passes
* cleanup from kitchen rework
* gives solars enough glass to complete it
* adds another defib to cryo pods
* makes asteroid sign fireproof
* perma maint now opens with virus + bugfixs
* bugfixing + adds missing holopads
* more holopads + bugfix
* adds some smoke vendors
* kitchen area tweak
* fixed errant rack
* rearranged/spread out cig vendors
* moved a cig machine again
* added RD tint button
* undid a brig area change
* removed errant posters
* added filing cabinets + bugfix
* maint morgue tray fix
* adjusted chapel + bugfix
* fixed palms + minor sec floor tweak
* adds forgotten magi and clown starts
* gave engi a shower
* reworked robotics + atmos bugfix
* geysers now work at 1/10 capacity when overpressure
* bugfixing + tweaked overrides/variables
* rework warden office
* bugfixes + adds some holopads
* added missing bio shutter
* more small tweaks
* adds RnD rework + gives mag some things
* fixed fabricators
* tweaked robo + added rnd server board
* added rnd backup circuit
* bugfixing
* bugfixing again
* bugfixing
* fabricator fix
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-09-13 18:18:25 +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
19536aa5c0
Gas Meter Resprite ( #26625 )
...
* Deletes old Gas Meter sprites
Bye bye!
* Resprites Gas Meter - edit of SmArtKar's TG version
- Credit to SmArtKar for original TG sprite.
2024-09-11 17:28:13 +00:00
0ab96c50dc
Patches resprite ( #26626 )
2024-09-11 14:00:10 +00:00
03bc64ad13
R&D Rework PT1 - The network refactor ( #26420 )
...
* R&D Rework PT1
* Give robotics access too
* Run prettier
* More lints
* This is INCREDIBLY ironic
* Re-add blacklisting
* Oops
* Review changes
* Some fixes
* Fix outstanding issues
* Warriorstar fixes
* Tiny tweak
2024-09-08 16:38:17 +00:00
e3c73110db
Adds Chemical flamethrowers ( #25091 )
...
* Initial work
* Good enough to open a PR out of draft
* Make these use the vars on the flamethrower
* Moar fixes
* Undefines define
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* This won't compile
* GDN review
* Fixes CI
* Fixes CI even more
* 5 ammo per tile now
* Heavily nerfs adding multiple fires
* Adds phlogiston as a burnable reagent
* Fixes the fire name
* Placeholder sprite + ammo use fix
* Now in cargo partially
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Lewc Review
* Adds nuclear variant
* Adds the chem flamethrower to the nukie uplink, alongside ammo
* More fire armor tweaks
* GDN review
* Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* TEMPORARY PUSH
* Adds inhands
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Fixes inhands
* Makes air hot again
* Lewc review
* Audible messages and canister refilling
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@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: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-05 23:12:56 +00:00
4919445067
feat: Add genetics cube lockers. ( #26547 )
2024-08-25 16:41:17 +00:00
0104291682
Slaying Goliath: a Washing Machine and Dyeing overhaul ( #26265 )
...
* Washing Machine Updates
* Dye Registry Improvement + Bug Fixes
* a couple bug fixes + beanie dyeing
* oopsie
* removes washing blacklist, it is unused
* Apply suggestions from Lewcc's code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* why is all my code fucking
* Update code/modules/clothing/gloves/colored_gloves.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* cleanup
* Update code/modules/clothing/gloves/colored_gloves.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* machine wash updates for simple animals
* Update code/modules/clothing/clothing.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* adds dyeing.dm documentation
* optimizations & visible_messages
* adds SIGNAL_HANDLER
* Update code/game/machinery/washing_machine.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* update comment
* cleans up cleaning_act()
---------
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-08-19 09:38:47 +00:00
64c8438f4a
sprites ( #26524 )
2024-08-19 00:15:45 +00:00
494704e323
Set Ore Redemption Machines to use Low Priority Messages ( #26444 )
...
* Refactor createMessage out of message server
* Change radio message
* Add reminder
* Fix linting errors
* Fix more linting errors
* Update priorities
* Add low priority icon
* Lower indent
* Fix switch statement
* Add low priority icon
* No reminders for low priority messages
* Update priorities in frontend
* Build and update /tg/ui
* Fix typo
* Clarify purpose of return
* [ci skip]
* Build and update /tg/ui
* [ci skip]
* Build and update /tg/ui
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
2024-08-17 15:31:33 +00:00
bd91a1b962
Obliterates the RSC ( #26498 )
2024-08-15 18:20:11 +00:00
2929d490b4
Re-adds the Disk Compartmentalizer ( #26460 )
...
* Re-adds the Disk Compartmentalizer
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: LtDiggs <41313156+LtDiggs@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: LtDiggs <41313156+LtDiggs@users.noreply.github.com >
---------
Signed-off-by: LtDiggs <41313156+LtDiggs@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-08-14 14:38:57 +00:00
73332ea101
Add an admin-spawn-only syndicate scanner ( #26434 )
...
* Add admin-spawn-only syndicate scanner.
* Add cooldown and sound on hit.
* Vars cooldown time.
* Update code/game/objects/items/devices/traitordevices.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
* Update code/game/objects/items/devices/traitordevices.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
* Code quality.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
---------
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-08-13 09:46:35 +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
3f75f3b8c3
refactor: Requests console directional helpers. ( #26226 )
2024-08-03 17:40:18 +00:00
44671e31e8
Adds: The C-Foam launcher ( #25738 )
...
* The start
* Getting a bit further
* Slight ammo casing update
* Istype helper and foam blockage
* Adds status effect
* Foam blockage and status effect fixes
* Autolathe ammo + stun
* aaaaaaaa
* Adds uplink item
* Actual slowdown
* Makes attacking a bit faster again
* Ammo increase to 12
* Sirryan review
* Adds sprites - almost working
* Lots of fixes + mineral doors
* Mineral doors don't open with foam
2024-08-01 06:24:09 +00:00
81aafadc97
[NEW/REVIEW RDY] Midround Event: Tourist Arrivals ( #26084 )
...
* ebent
* WHYYY
* bobobo
* adds ton of epic stuff
* messages added
* Outfit!
* Indentation! Arrhghg
* Gamemode checks, antag check stuff and outfit changes and tourist icon
* ID icon, random species, gender, hair, a few comments and logs.
* Mirroring review
* Applies suggestion
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com >
* Tourist Id's now have linked accounts, code cleaning as per reviews
* Following suggestion
* Apply suggestions as per review
* Addresses the risk of two people having the same account
* Typos and final cleaning
* Checking for jobban/Not showing as tourist on manifest
* Orbit test
* compile
* ebent
* WHYYY
* bobobo
* adds ton of epic stuff
* messages added
* Outfit!
* Indentation! Arrhghg
* Gamemode checks, antag check stuff and outfit changes and tourist icon
* ID icon, random species, gender, hair, a few comments and logs.
* Mirroring review
* Tourist Id's now have linked accounts, code cleaning as per reviews
* Applies suggestion
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com >
* Following suggestion
* Apply suggestions as per review
* Addresses the risk of two people having the same account
* Typos and final cleaning
* Checking for jobban/Not showing as tourist on manifest
* Orbit test
* TGUI Bundle Rebuild
* Applies suggestions
---------
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-30 14:10:08 +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
26f28cb7e7
A new space ruin, the telecommunications satellite? [100% done, ready for final review] ( #25820 )
...
* THE WORK, IT GOES AND SO IT GOES
* darker yet darker
* more changes
* Almost done, let's post the pr and have some dev people test it out.
* update comment
* small change
* pushing , then we address changes
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* more progress
* final bar lines
* aditional tweaks
* Update telecomns_returns.dmm
* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* sirian changes
* emp weakness, light changes
* no runtimes, shoot borgs
* sorry for all the commits just update to master thanks
* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* fixes
* fixes pathing. Voices
* removes always spawn
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* more changes
* requested string change
* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* lewcs final changes
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-07-25 18:26:14 +00:00
98f0931c14
refactor: Allow using access helpers for airlock spawners. ( #26141 )
...
* Allow access helpers for airlock spawners.
* whoops
* whitespace
* add visual access helper placement indicator
2024-07-23 08:51:14 +00:00
14a7b74c2a
Dredd armor resprite - finally deconflicted (i hope) ( #26167 )
...
* human sprites
* спрайты хуяйты
* spritesheets
* indentation my ass
* accidental duplicate removed
* deconflictingingingingingikng
2024-07-07 13:11:31 +00:00
d075a682a0
Strange objects resprite ( #26131 )
...
* resprite
Signed-off-by: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com >
* fix
Signed-off-by: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com >
---------
Signed-off-by: Us3rn4me228 <143436581+Us3rn4me228@users.noreply.github.com >
2024-07-07 00:03:44 +00:00
608b4223b9
Adds a traitor rapid healing item: "Hyperregenerative Medipen" ( #26033 )
...
* Adds Hyperregenative Medipen to traitor uplink
* remove rogue pixel
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/hypospray.dm
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Cuts iron, sanguine, and spaceaccil from the medipen
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
---------
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com >
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-06 08:38:17 +00:00
e386cfd9bf
Lamp Bloom, Exposure and Glare ( #24534 )
...
* Light Update
* Not failing tests I hope
* Whitespace Removal
* Tweaking here and there
* Merge Conflict Fix
* Rebuild TGUI Bundle to Fix Merge Conflict
* Settings are now in "Game Preferences" too
* ColorMatrix formatting and removal of unused procs
* A little mistake on matrices
* A little mistake x2 (last I hope)
* Moving Glare under every other effect, tweaking values, playing with blending
* Update TGUI Bundle for Merge Conflict
* Apply suggestions from code reviews
* Fuck it, it just works
* No tabs cool
* Remove unused
* Am I retarded
* We better return
* Whitespace we need
* oh
* New SQL update version
* Missing comma fix and recompiled tgui.bundle
* Updating SQL version in misc_defines and config
* Remove datum in holder
* BloomEdit empty lines removal
* No more unneeded functions calls
* Tgui.bundle rebuild
* SQL Changes
* SQL Version = 56 now
* Documentation and some formatting
* tgui.bundle.js rebuild
* Remove unused layers and variables
* Allow cameras to render backdrops
* Possible runtime issue fix
* Remove "baked" bloom from the lamps
* Revert the "remove". Make it low on alpha channel
* Shuttle rotation light update fix
* We don't need this
* Possible runtime issue fix x2
* tgui.bundle.js update
* tgui.bundle.js update
* tgui.bundle.js update
* Revert config.toml changes
* Revert the revertion of config.toml changes
* Bring that config changes back!
* Entry added
* tgui.bundle.js update
* Prettier possible fix (?)
* Runtime fix (and broken tubes now have light after reinstalling them)
* config update
---------
Co-authored-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com >
2024-07-05 21:16:16 +00:00
97d4525ce7
new dropwall sprites from TG, fix dropwall timer ( #26063 )
...
* new dropwall sprites from TG, fix dropwall timer
* improves icon further
2024-07-05 17:01:20 +00:00
cc8aa14e9f
Greyman Henley - Alternative to tacticool (and Dexter reference) ( #26031 )
...
* sprites for test
* fixic
* species
* icon state
* fixies
* loadout and vendor
* palette update
* color update
2024-07-03 03:47:01 +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
b727162ed9
SMES resprite ( #26041 )
...
* sprites, hopefully i dont need anything else here
* overlay position fix
2024-06-29 17:33:15 +00:00
fc7bc29245
Adds the sec great coat. Does not include kidan as mcramon plans to remove their shoulder pads. ( #26071 )
2024-06-28 22:17:47 +00:00
6db06b1eb8
Plant DNA Manipulator update ( #25370 )
...
* WIP
* changes
* more changes
* chnges
* update
* changes
* I suck at TGUI if you see this please help
* UI a bit better still figuring it out
* More things
* Eject Select, Select empty and autoselect empty implemented. can insert replaace stat/all stats from disk list
* Ready to make a PR
Disks can be loaded into the machine from boxed, an empty disk is automatically selected once an extraction is performed if one is available. All insert and replace buttons moved to the disk lists. Window size and scaling changed to fit LSD properly without wrapping.
* minor ui tweak, fixes core stat disk being auto selected unintentionally. Loading via box now makes a sound.
* rebuild TGUI
* rebuild tgui
* implemented RO button/indicator in UI, Added null checks for can_add
* slightly shrink some buttons rebuild TGUI
* Rebuild TGUI
* use istype for type checks
* removes the disk compartmentalizer from maps
* removes Disk Compartmentalizer
* actually removes the disk compartmentalizer
* rebuild tgui and remove all remaining disk compartmentalizer sprites
* fixes a message being output to world instead of the user
* auto doc and readability improvements.
* some fixes
adjusts display name to display the new doubled percentages. Stored seed no longer counts as a disk for the purpose of reaching the disk capacity.
* Rebuild TGUI
2024-06-28 18:57:32 +00:00
a3af356e55
New bag sprites by Alexios! ( #25810 )
...
* New bag sprites!
* New biobag sprite
2024-06-28 02:05:04 +00:00
f6b8d87e78
Adds sscooters and skateboards [serious pr do not close after AFD] ( #24934 )
...
* WORLD WIDE NOISE
* Makes it pass CI, tweaks values, glass table hoverboard, and railing grinding
* grind on pipes
* https://youtu.be/cTiM1MJ1o7c?feature=shared
* https://youtu.be/Jc6CHI9f6cM?feature=shared
* temporary change for icon conflicts (hopefully)
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* The rest of the fun loving owl
* missed this one
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* changes
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* I love stealth conflicts!
* purge lines
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update tg_vehicles.dm
* works works works
* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-06-25 21:38:40 +00:00
a7d1610255
[HOTFIX] Nianworme inhand / UI sprite fix ( #26009 )
...
* Should fix the missing hand sprite for caterpillars.
* Adjusts a comment.
2024-06-22 22:43:09 +00:00
f0cef57c17
Nian Caterpillar Infestation and Worme Invasion ( #25560 )
...
* I hate DMI merge conflicts.
* Attempt at full merge conflict resolution
* Ticked >:C
* Moves the include because
* Fixes missing proc.
* 🫃
* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.
* Adds changes requested by DGamerL
* Replaces space indents with tabs. Error caused by copy pasting.
* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Uniforms the tab spacing.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Adds requested changes from @lewcc
* Removes so missed #undef in `monkey.dm`
---------
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@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-06-22 18:20:27 +00:00
fa578375db
REOPEN. Adds nanotrasen pin, pride pins and pride undershirts. ( #25833 )
...
* be whoo you areee for your prideeeee. don't hideee
* nanotrasen pride nationwide
* Update code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-18 00:14:24 +00:00
Qwertytoforty