8d82546d9d
[FIX] Mobs that were offered up to ghosts no longer get taken over by their old owners ( #26650 )
...
* Grab_ghost now checks the ckey of the mind
* Remove superfluous loops for getting ghosts.
* Early return for MMI
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-09-16 14:39:54 +00:00
Qwertytoforty and GitHub
a0c7867581
you no longer can instantly husk people as an ERT inquisitor ( #26798 )
2024-09-16 04:01:01 +00:00
Silverplate and GitHub
024af9c248
Removes tech levels from high risk items ( #26725 )
2024-09-16 03:28:49 +00:00
BiancaWilkson and GitHub
f42a7d9ab0
Fixes a runtime caused by stacks accidentally merging twice ( #26795 )
...
* Fixes empty stacks trying to merge together
* more accurate comment
2024-09-16 01:58:29 +00:00
Qwertytoforty and GitHub
44694d8fa5
makes you unable to to see inventory from another zlvl ( #26793 )
2024-09-15 20:19:48 +00:00
Qwertytoforty and GitHub
04e65c7496
whoopsie ( #26777 )
2024-09-14 18:39:55 +00:00
DGamerL and GitHub
515d3ebd95
Makes chemical flamethrowers more efficient ( #26742 )
2024-09-14 02:59:12 +00:00
Coolrune206 and GitHub
52442e64ba
Removes hoverboard from SOO starting inventory ( #26661 )
...
* removes hoverboard from SOO
* comma
2024-09-14 02:56:46 +00:00
Qwertytoforty and GitHub
7be7ec7090
reflectors anchor on mapload ( #26745 )
...
* anchors reflectors on 2 maps to not troll engineering
* anchors on mapload
2024-09-14 02:54:45 +00:00
9c4a4c6c3d
The cloner once again mulches people on emag or emp ( #26653 )
...
* The cloner once again mulches people on emag or emp
* it has to be after each if, as the circuit board and beaker are passed as a stock part
* Update code/game/machinery/clonepod.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update code/game/machinery/clonepod.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* merges it
* istypesit
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
2024-09-14 02:53:36 +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
XFirebirdX and GitHub
a71424d5b1
Changes the permissions for the Door Remote of the RD, QM, Command. ( #26646 )
...
* Update access.dm
* Update access.dm
2024-09-13 17:23:14 +00:00
9704445473
Farragus: Remaps Service Asteroid and Locker Room Area ( #26493 )
...
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Much Work
* CI
* OSHA Exit Sign
* CI
* CI
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* CI
* CI
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Removed accidentally duplicated pipe.
* Update cerestation.dmm
* Update cerestation.dmm
* CI
* CI
* Update cerestation.dmm
* Update based on review
* Makes all service intercoms into cardinal bumps
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* fixes an errant loot spawner
* Update cerestation.dmm
* Moves bar electrical delivery wire to maint.
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-13 00:49:11 +00:00
20f47a7f40
Adds Syndicate organizations ( #24040 )
...
* framework
* factions and objs done
* objective framework
* remove you_are, implement intro_desc
* assassinate syndi text
* remove extra space
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Implement steal items
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* revert forced escape obj
* rename i var
* readd martyr check
* difficulty defines
* remove discounts
* add electra dynamics
* add hawkmoon
* repath org, add gameplay blurbs
* cuts unnecessary content, add org selection, updates
* move defines
* var names
* update numbers
* set defines, tweaks
* add hijack forced obj
* update L O R E
* remove forgotten todo
* document steal_list
* use initial()
* fix comments move steal objs
* apply code review suggestions
* use pickweight
* flags
* replace hardcoded target jobs by target_department
* comment fix
* incorporate org objectives into delayed objectives
* fix martyr check location
* Remove abuser vocab, debug names for orgs
* readd obj name as user, VV only
* add traitor panel and fix forced objective
* reword ARC objective
* change forced objective to list
* rewrite to US spelling
* Rework objective selection
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: datlo <quentinkoyote@gmail.com >
* add hunter notification, review stuff
* Update code/game/gamemodes/objective.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: datlo <quentinkoyote@gmail.com >
* fix lists
* Updated captain's sabre typepath
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
---------
Signed-off-by: datlo <quentinkoyote@gmail.com >
Signed-off-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2024-09-12 19:08:21 +00:00
6e3635171c
[SPRITES] Emissive mechs ( #26589 )
...
* Emissive mechs
* I accidentally touched the Durand
* old_durand lightmask
* Phazon open sprite upgrade
* Move emissives to seperate file
* Add unique emissives for dragon armour ripleys
* Edge cases for updating overlays
* Changed number to a define
* Added Autodoc
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-09-12 17:25:45 +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
fe834bffee
Updates some salvage lore ( #26595 )
...
* salvg
* Update code/game/objects/items/salvage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
* Update code/game/objects/items/salvage.dm
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
* Update code/game/objects/items/salvage.dm
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
---------
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com >
2024-09-12 17:05:26 +00:00
0a7873c4bc
Makes the cryo anomaly more dangerous ( #26614 )
...
* Makes the cryo anomaly more dangerous
* Reduces the amounts for vetus
* Update code/game/objects/effects/anomalies.dm
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-09-12 17:02:46 +00:00
DGamerL and GitHub
62601ab838
Various chemthrower fixes ( #26697 )
...
* Various chemthrower fixes
* Slight tweak
* Fixes extended thrower
* Fixes
* Slight examine tweak
* Name tweak and a fix
2024-09-12 17:00:32 +00:00
warriorstar-orion and GitHub
f67dbca14f
refactor: use signal for explosion sensors. ( #26703 )
2024-09-12 16:59:09 +00:00
warriorstar-orion and GitHub
716428dfbf
fix: remove two unused vardecls ( #26756 )
2024-09-11 18:01:52 +00:00
Daylight and GitHub
965b42bf51
[FIX] Cult Shadow Shackles can now cuff people who are missing an arm. ( #26707 )
...
* Copies the requirements from handcuff code
* This proc is never implemented
* Removes unused procs
2024-09-11 17:34:20 +00:00
warriorstar-orion and GitHub
9a5db8f91e
refactor: remove CanPass height arg ( #26700 )
2024-09-11 14:49:30 +00:00
80fbaf5632
Fixes for mech crusher ( #26741 )
...
* E
* forgor this
* forgor this thing too
* add icons
* Update work_tools.dm
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* Update code/modules/research/designs/mechfabricator_designs.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* my beloved , gone.
* misinput!!!
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* Review compliance
* Update work_tools.dm
* Update work_tools.dm
* more fixes
* Update work_tools.dm
---------
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2024-09-11 13:42:32 +00:00
Charlie Nolan and GitHub
6c2d43ec5a
Re-weighted secondary goals. ( #26586 )
2024-09-10 22:42:26 +00:00
chuga-git and GitHub
f57ebfa1a0
Fixes stacks, attempt 2 ( #26633 )
...
* this is hell pain
* fixes merge issues when cutting up various items
* adds early return to attackby
2024-09-10 22:14:01 +00:00
CRUNCH and GitHub
33b2dc35fb
Remasters the Clown-Mime Battle Ruin ( #26539 )
...
* Creation
* Improvement
* Fully wires up the SMES
* Update clownmime.dmm
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
2024-09-09 23:50:48 +00:00
20d225809b
The mech crusher module ( #26550 )
...
* E
* forgor this
* forgor this thing too
* add icons
* Update work_tools.dm
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* Update code/modules/research/designs/mechfabricator_designs.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* my beloved , gone.
* misinput!!!
* Update code/game/mecha/equipment/tools/work_tools.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
* Review compliance
---------
Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2024-09-09 23:41:51 +00:00
7555aefd89
Replaces the changeling gamemode with a vampires + changelings gamemode. ( #26620 )
...
* Replaces the changeling gamemode with a vampires + changelings gamemode
* Back up to 15
* Lowercase the bs
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-09-09 19:19:30 +00:00
warriorstar-orion and GitHub
da4e51930f
fix: R&D rework: convert rest of tgui_alert choices to lists ( #26721 )
2024-09-08 19:03:35 +00:00
AffectedArc07 and GitHub
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
CRUNCH and GitHub
e87982e794
Update cigs.dm ( #26694 )
2024-09-06 09:27:59 +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
Luc and GitHub
1b2b8434bd
update stealthmin handling ( #26676 )
2024-09-04 06:47:47 +00:00
73e861b7c0
Dev team chat ( #26669 )
...
* dev team chat initial
* oops
* refactor who code
* allow discord relay
* yeet some un-needed stuff
* tweak the role colour
* Update code/__DEFINES/admin_defines.dm
Co-authored-by: ROdenFL <ROdenFL@yandex.ru >
Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com >
* .Add to +=
* Update config/example/config.toml
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com >
---------
Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com >
Co-authored-by: ROdenFL <ROdenFL@yandex.ru >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2024-09-03 16:49:45 +00:00
e77ced338e
Demotion properly updates HUD icon ( #26672 )
...
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-09-03 13:20:13 +00:00
8482c55135
Cleans up /obj/effect/decal/cleanable ( #26631 )
...
* makes cleanable decals not runtime when merging on windows in zero gravity. makes cleanable decals not qdel in initialize.
* Update code/game/objects/effects/decals/Cleanable/humans.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
---------
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-09-03 13:16:32 +00:00
Luc and GitHub
00a0b8f004
Fix runtimes when events cannot find a valid event area ( #26594 )
...
* Fix runtimes when events cannot find a valid event area
* oops
2024-09-03 13:13:49 +00:00
Migratingcocofruit and GitHub
6f1a90c59d
Documents and standardizes power and energy units. Fixes a pulse demon bug. ( #26560 )
...
* Documents units of electrical power storage and production. Defines KJ. SMES properly convert watt ticks to KJ. Pulse demon bugfix
* extra documentation
* corrected pulse watt tick to joule conversion location on the pulse demon code
* oops
* Fixes nomenclature formats
* fixes some comments, consolidates power defines in the power defines file
2024-09-03 13:13:24 +00:00
PopeDaveThe3th and GitHub
58c7fa9a0d
Fairly Sizable Fed Lore Drop ( #26600 )
...
* the fedening
* Federation -> TSF
* Update outfit_admin.dm
* Update outfit_admin.dm
* i forgor
* few more
2024-09-03 13:04:56 +00:00
4be3cdeb4c
improves tarot card logging ( #26618 )
...
* improves tarot card logging
* Update code/game/gamemodes/wizard/magic_tarot.dm
Co-authored-by: 1080pCat <96908085+1080pCat@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 >
2024-09-03 13:03:09 +00:00
Daniel Lenrd and GitHub
de1250ab42
Adds and Adjusts Loadout Items ( #26441 )
...
* Give Paramedic a medical beret
* Change path of Wardens' beret
* Give HOS and Warden loadout berets
* removes Barber from Service Armbands
* Gives Captain Procedure Armband
They are technically a Head of Procedure
* Gives Explorer Cargo Armband
* Gives Geneticist Research and Medical berets
* Gives Geneticist Research and Medical armbands
* Gives Virologist Medical armband
* Gives Detective Security beret
* Gives Shaft Miner Cargo beret
* Gives Explorer Cargo beret
* Gives Geneticist Research and Medical winter coats
* Gives CMO EMT armband
they can have EMT labcoat, they are trained professional, why not?
* Gives Geneticist Research and Medical bomber jackets
2024-09-03 13:02:33 +00:00
9ef47e7935
Enhances the Smoking Experience - Adds Many New Item Interactions for Cigarettes and Items Interacting With Them ( #25571 )
...
* Refactoring and other stuff.
* moar
* More smoking
* Update energy_melee_weapons.dm
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update cigs.dm
* Update cigs.dm
* Update cigs.dm
* Update code/game/objects/items/weapons/lighters.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* eee
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* sigh
* Update cigs.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* hell
* Update cigs.dm
* aa
* cool
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* aa
* aaa
* suffering
* Soon
* Is it done!? Am I finally free!?
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update
* Update
* No longer assume the cig is in a mouth
* Update tools.dm
* Update pronouns.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* update
* Attack animations for sword lighting!
* Update
* indentation
* Update cigs.dm
* minor refactor
* Update items.dm
* Update items.dm
* Update welder.dm
* Update energy_melee_weapons.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* refactor
* Update items.dm
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Update flamethrower.dm
* clipping
* Update legion_loot.dm
* anti attack check
* Fixes a zippo runtime
* Fixes evil runtime and stops unnecessary violence.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update based on review
* Update cigs.dm
* Update energy_melee_weapons.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update toys.dm
* Update energy_melee_weapons.dm
* Update legion_loot.dm
* Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
---------
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-03 13:02:13 +00:00
warriorstar-orion and GitHub
1de5df28bb
Fix runtimes in Lavaland river procgen. ( #26606 )
...
* Fix runtimes in Lavaland river procgen.
* fucking what, sanity check
* add back attempt bailout
2024-08-30 13:27:54 +00:00
Qwertytoforty and GitHub
3c7c9cacf0
Tweaks to Dvoraks telecomns sat ruin ( #26429 )
2024-08-30 13:22:16 +00:00
XFirebirdX and GitHub
5ca10363c1
Update HolodeckControl.dm ( #26632 )
2024-08-29 18:31:05 +00:00
1080pCat and GitHub
d39cd4bb36
Reflectors now need to be anchored to reflect, as well as lowered the hp of them ( #26558 )
...
* Reflectors now need to be anchored to reflect
* qwerty suggestion
2024-08-29 00:05:39 +00:00
warriorstar-orion and GitHub
9dca367af5
blackbox: Track Lavaland mob/tendril spawn counts. ( #26602 )
2024-08-29 00:04:59 +00:00
ccf70d51ca
Makes the vortex anomaly more dangerous ( #26508 )
...
* Makes the vortex anomaly more dangerous
* Update code/game/objects/effects/anomalies.dm
Co-authored-by: Luc <89928798+lewcc@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: Luc <89928798+lewcc@users.noreply.github.com >
2024-08-29 00:01:56 +00:00
1080pCat and GitHub
681ad6ca4a
You can no longer get abductor rnd level 3+ from 1 ( #26598 )
2024-08-28 23:59:05 +00:00
