* no longer super sick time to port station traits in a 4 hour rush as you have lost control of your life
* some changes /fixes
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes
* oh right, the murders (uplink price tweaks)
* Update code/controllers/subsystem/SSjobs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* compiles
* doesnt work but works better
* tgui dogs still sleep but I want to sleep
* it should finally compile now. Probably.
* Update tgui.bundle.js
* Sorry IAN, transfer components is shoddy as hell
* removes minor uneeded /tgui
* also extra line whoops
* final stuff
* reverting changes I made earlier is hard ok
* Weight change, uplink reference
* oh right, the hey fucko
* Update code/_globalvars/traits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update tgui.bundle.js
* pushes
* pulls it
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* more changes, ion rifle blocked on cyb revolution
* dipshit remove the debug / tgui pritier and such
* tgui
* updates tgui again as nanomap was merged
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* comment / tgui
* every day I worry all day
* Full TGUI rebuild + prettier
* ah fuck
* leave a customer feedback at the link below!
* tgui momenr
* tgui moment
* FUCK I am dumb
* vertical TGUI
* She T's on my GUI till I
* Update tgui.bundle.js
* Apply suggestions from code review
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* IPC can now use robotic hearts / pulse demon hearts and charge
* fixes revert not working for hangover / arrivals
* tgui moment
* hhgreg
* fixes that one bug
* Every day I worry all day
* deconflicted for real this t ime
* Update code/datums/station_traits/postive_traits.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* ch-ch-ch-changes
* Update SSjobs.dm
* Update code/modules/supply/supply_pack.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* deconflicted but won't pass CI
* fixes double dipping on traits
* my le consoles, they le no work?
* Great Great Asset, Asset, Great Great Asset, Asset...
* sorry slime mains
* fixes borgs being punished heavier
* actually fixes it, I was dense
* hopefully fixes borg drunk further
* makes it compile?
* actually makes it compile god whyyyy
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
* New NT Recruiter update
* Adding emag effect for the arcade + other tweaks
* tickets for reward too
* ops
* Medal prize!
* adding sounds when losing!
* increasing minimum bad max age
* added small interaction cooldown
* adjusting time
* tgui rebuild
* ah shit, here we go again
* tgui rebuild
* lets fix this
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* tgui rebuild
* tgui rebuild
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* proof-of-concept implementation
* clear being_hijacked on death
* it glows in the dark
* oops
* machinery interactions and some fixes
* consistency, correctness, fixes
* stop usage of the \the text macro
* list inits in Initialize
* fix control flow spacing
* review compliance
* event code and some tweaks
* upgradable spell abilities and some tweaks
* how did that happen
* cycle cameras spell
* stat upgrades (no sprites for now)
* tweaking
* sounds
* jecties code
* more tweaks and fixes
* some review stuff
* alt-click user param and charger icon fix
* Remove unused default amounts in objectives
* Comply with sirryan review (part 1)
* Move isapc definition
* Add autodoc comments to all pulse_demon vars
* Give random number in name on init
* Fix merge conflicts
* Remove pulse demon from traitors on Destroy
* Fix mulebot relaymove override
* Fix airlock TGUI actions
* Fix loop over mobs in cablehop
* Attempt to fix overload runtime
* Half-fix gun cooldown issue
* Fix chat related issues
* Attempt to fix overload runtime (take 2)
* Make ion projectiles collide
* Tweak pulse demon speed
* Make demon survive loc being deleted
* Send message when saved by self-sustaining
* Fix vv_edit_var for charge
* Stop people disabling hijacked bots
* Make demon lose more health when not on wires
* Increase costs of stat upgrades
* Allow demon to change its drain speed
* Stop demon obliterating xenos
* Comply with review (partial)
* Fix issues pointed out in reviews
* Allow demon to drain charge of reachable items
* Adjust volume of demon sounds
* Improve cell interactions
* Bump up event weight (for testmerge)
* Give pulse demon a highlight section on orbit menu
* Give demon an experimental soft-counter to insuls
* Reduce volume of most common sounds (again)
* Update demon cable overlay when required
* Stop AI using its tracking ability on pulse demons
* Add wizard spawner for pulse demon
* Tweak EMP behaviour and numbers
* Clear references in Destroy
* Make appear on end of round credits even when dead
* Prevent pulse demon from detonating cyborgs
* Generalise insulated structure check
* Clean up remaining review requests
* Add new sprites
* some addressed reviews
* Typepath changes, GC fixes
* I blame charlie
* good enough
* die or something
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* even more changes
* final tweaks
* what
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* bam
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* to_chatn't
* deconflicted
---------
Co-authored-by: unknownuser782 <126365777+unknownuser782@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* stuff
* works!
* bye bye tailwhip
* renames the ability
* accidental enter
* snowball's reviews
* tweak
* less tight timing
you can now ignite on 3u instead of 4
* no longer works with covered mouth
* ash walkers
* most of jimkils reviews + unathi also have c/d now
* early returns, uses less fuel, comments
* hal's reviews
* redundant comment
* hal's suggestion
* sounds & tweaks
* an unnecessary check
apparently
* so that check WAS needed
* henri reviews, tweaked loc of sounds, timer tweaks
* henri review
* Update code/modules/mob/living/carbon/human/species/unathi.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* NT Recruiter arcade
* TGUI and other tweaks
* No longer called curriculum
* Name now matches with species
* almost there
* TGUI, MORE tweaks
* removing useless stuff
* breaking some lines
* Lets gooo
* More sounds effects and screen adjustments
* missing sound here
* More sounds and records
* Moooore records
* TGUI title, volume tweaks and sprites added
* Added the rest of the records
* Invaliid planet and other small tweaks
* New reward amount
* More tips
* added design and more tweaks to volumes
* tweaks to values and records
* Better comment
* More tweaks to sounds
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* DGamerL review
* job typo
* typo and cybersun is actually bad
* golem bad
* We now check for matching names
* Tweaks to the TGUI buttons
* begin shift
* tgui conflict
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* data list indentation
* tgui rebuild
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* tgui rebuild
* tgui rebuild
* tgui rebuild
* Moving to naother file
* moving to another place part 2
* ops
* tgui rebuild
* sprite conflict pt1
* adding sprite back
* tgui rebuild
* its conflict time
* tgui rebuild and sprite conflicts
* tgui rebuild
* New CEO child name
* Better do it later
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* biting off more than I can chew, but I feel like hurting myself
* more shit
* progress continues, moral stays sameish
* bite of 2587
* mod_theme down, but probably broken
* 385 errors, 16 warnings, zero tgui interactions
* 292 19
* final strech to buggy mess, break time
* it compiles. It almost fucking certainly doesnt work, but it compiles
* fudhsciffubgsbgpgb actions not working as should for modules
* fuck it we'll just open the pr as we work on it
* icons work now
* tgui stuff
* more progress
* JUDGEMENT
* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.
* jetpacks, gps, and go do what exo-suits yourself
* almost ready
* sorry to whoever has to review this
* should work™️
* should be good now
* pushing changes so I can do reviews next
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* lore™️ Adds illegals level to modsuit parts from syndicate.
* early returns
* and these illegals
* no uplink reference idiot
* mod inhands are a good idea
* this is needed for inhands nerd
* Bomb detector working, modsutis cover ears. skin things
* overslotting removal, cyborg charging, ert loadout for gamma
* duplicated signal
* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.
* tether module, orb module, holster stuff
* built in no slip, cheaper 87
* removes modules already installed, engineer ert get jetpack, equip into modsuit storage
* comments spaces and duplicate flags
* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Compile TGUI, slowdown adjustment, Modsuit to MODsuit
* sonar, do after, more equipment, acid handling
* overlay bugs / ERT / DS suits autodeploy
* middle click action buttons
* traders, sec modsuit energy nerf
* surplus weighting
* Kinesis module.
* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis
* more power / unused module removed
* name, ds fix, pre equipped to cc suit
* depot / grammer
* ok should be good™️
* overslot, dupe gun, missing suit storage
* stealth nerf, new kit
* gun stuff / ds theme
* bio armor is gone
* let me push changes please thank you
* makes shocks work right
* copies over some changes TG made to module prices after porting
* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-
* sirryans changes
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Control define, ERT / DS have gloves / boots again.
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* More changes
* god I hate tgui. Why do all the bundles live underground, instead of in my basement?
* she updates my master till I testmerge
* modsuits can recharge again
* fixes a lot of shit
* Ready for TM probably
* sure fuck it whatever that makes sense I guess
* the pinpointer works better™️
* Another storage module bug fix
* hair and medical stuff
* fuck fuck fuck
* fixes sonar
* Bag exploit fixes / plasma runtimes / ear nerf
* dna lock improvement / cryostorage
* whoops
* Ball form second cooldown wasn't helping, no more infinite cores
* she springs my lock till I ***SNAP***
* plasmaman no longer die
* fixes modsuit emp issues
* atmos no longer fucking dies
* Fixes, module printing, and a restriction on newly constructed modsuits
* Inventory code my hated
* WOOO PREFERENCE CODE WOOOOO
* icons my hated
* fix for mods / spaceproof shit
* holy shit whhhyyyyy
* backpack first
* Update mod_theme.dm
* prevent infinite gun arms / infinite modsuit cores / syndicate modules
* fixes tm error
* scream loudly if species sprites break. They shouldn't, but, you know.
* deconflicted with luck
* converts to refit for species
* fix pathfinder
* fixes modsuits being funky power wise
* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit
* nerfs the atmos modsuit
* magboots for ds / CC modsuit
* downside of autosave: typing in wrong window saves bad stuff
* Gamma ERT have internal cameras again.
* spellcheck when
* ah fuck
* yes delete the null that works
* whoops
* fixes error / description
* un vulps your cannon
* fixes tails disapeering on base modsuits
* space to underscore
* tgui fix / tajaran
* springlock buff, cryopod fix
* u helps
* WHO PUTS A GUN IN ITEMS
* tgui moment
* mining modsuit nerf / hidden holster module
* PAIN
* UNATHI TIDE STATION WIDE
* I love special code
* slightly dense
* shark jumpscare
* fixes ghost item, fixes springlock being bad
* YIPPEEEE IT WORKED
* she decons my flict
* pain
* ebbas days are numbered :^)
* hidden
* r-r-r-ebuild
* fixes more bugs
* qwerty, you are dense
* fixes gps
* fix mulebot crate
* level fix
* adds back icon
* moving storage, fix bug, modules activate / deactivate message
* yeah
* yeah
* yeah™️
* steels requests
* windoors no longer make pathfinder module explode
* chat spam
* oil slicks + modsuits
* whoops
* bag check
* ofc
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/datums/uplink_items/uplink_nuclear.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/modules/module_pathfinder.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* Removed dupe playsound, sound now uses var
* pill bottles now have sounds
* Patch packs also have sounds
* Increased patch packs volume by 4db
* Moved sounds to folder, added licence and credits.
* Fixed invalid sound paths
* initial delta alarm stuff
* TODOS
* make it do this
* safeties
* stop on explode, proper loop, volume corrections
* ping be gone
* better end timing, worse code implementation
* sirryan fix
* farie
* adds the stealth implant
* changes
- rename "implant" to "bio-chip"
- removes the stealth implant box in favor of spawning implant directly for the traitor
- makes the fake box not show up on right click. Makes the real box not show up on right click when invis
* sirryan pt1
* lewcc review 1
* fix conflict
* fix conflict
* signal handler
* Implement it
* Re-adds the emag action
* bump cooldown for emag
* shout shout let it all out
* emag feedback, cleans up a bit
* better message, too
* Remove uncmag, since the trait removal is handled where it's called
* Sirryan review
* sean review
* You asked
* Tweaks
* Update eftpos.dm
* Adding registers
* good luck meta you'll need it
* Update eftpos.dm
* More sounds
* More sounds, you can pay as long as you're close to the register.
* Tone down the edits, chefs will figure it out
* tim allen grunt
* Update eftpos.dm
* Update eftpos.dm
* Update code/modules/economy/economy_machinery/eftpos.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Ceres is a thing now
* Fix merge
* Update eftpos.dm
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* change da world
* compile, thanks
* Update cere.dmm
* Update cere.dmm
* ready for test
* use the proper name please
its CERE not ceres.
* stops shuttle from forcibly docking with podbay
* things are now different
Landmark update for job spawns.
More hardsuits in EVA, engi, and atmos.
Disaster counters properly added.
Vault is now more spooky.
Gamma armoury moved to below gulag shuttle.
Sleeping rooms replaced with arcade and swimming pool.
Captains ERP nest deleted.
Tcomms now looks like it was designed by a functional human being.
Mining doesn't need a weird glass box.
Shuffled docking ports at arrivals.
Windows are now reinforced windows.
Mr changs has arrived.
* disposals functions now
* now with 50% more air
* gamma armoury doesn't attempt to become one with gulag shuttle
* disposals net is airless, vault is enclosed in some rock
* standard number of escape pods
* slight fixes
* more bugfixes
* lighting fixes
* divided hallways, added psych office, more cams
* fire alarms, shutters, and fixes
* temporary DME edit to set cere as default map
* fixed shuttle runtime
* this compiles and runs locally, please CI
* fixes hidden double pipe
* more double pipes
* more vents and scrubbers, morgue body delivery
* tweaks to secbot pathing
* various QoL changes
* Medbay expansion, med+arrival maints expansion.
* the definitive air alarm update, and more!
* Departmental emergency EVA suits, signage, tweaks.
* 2 Cryodorms added (oops). Asteroid sound updates.
* Borg cryo, shutters correctly rotated.
* Supply shuttle edit. I like joining the map queue.
* minor fixes, grav gen isolation.
* minor fixes
* Disposal fixes, lighting adjustment
* SabreML feedback changes
* More minor fixes
* More fixes
* NSS Farragus
* (most) floors turn into asteroid sand, not spess
* reverted random file edit, fixed mr teeny
* minor fixes
* big bombs can breach asteroid areas
* Asteroid plating exists, did you know? I do now!
* camera network pass
* walls become sand too on destruction
* lighting pass
* implements feedback, dramatically reduces ores
* yeets ores entirely, sci break room added
* roundstart pads, more solars, bigger departures
* runtimes
* mining resistant rock
* variable names are important
* AoE KA doesnt affect rocks
* actually fix AoE stuff
* now with 1000% more bats
* no sandy cables, a brig exit chute, more head ssu
* mech drills are not pickaxes
* proc rename, perma window, faster sapce bridges
* Brig rework
* robotics changes
* More sci edits
* Rotayshun changes
* dme edit
* Delete cerestation.dm
begone, thot
* temp edit so it loads cere as default
* merge conflicts begone
* decal purge
* map repipe
* removes under-wall pipe adapters
* shuffled maint areas
* dirt purge
* longest bridge rework
* fixes
* PPI feedback
* kitchen does, in fact, need air
* permabrig tweaks
* restores cc changes
* merge part 2
* tag purge
* secret clown HQ got me shook
* SQUASHENING
* solar shuffle
* directional consoles
* remove TM edits due to rotation
* merge conflict part 2
* pod pilot deletion
* cold rock, window tint fixes, etc.
* further red rocks
* further tweaks
* more standardising
* robotics redo
* carpet time
* CI update for cere
* Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
* more squash, corridor cam removal, etc.
* light switches
* minor fixes
* temp cere default
* FOODCART!
* fixes
* no airless no more
* space_hall
* compat pass 1
* make it work
* more changes
* slimmening
* air alarm tweak
* TM commit
* ci tests
* final CI changes?
* squash. squeeze, optimise
* wall vent
* disposals fix, more squeezing
* bugfixes
* false walls
* bedroom culling
* edits and fixes
* tweaks
* changes
* det window
* further tweaks
* Revert "TM commit"
This reverts commit 9e8814937f.
* More TM only changes reverted
* fixes smoothing with falsewalls
* denth changes
* the airlockenning
* cicicici
* CICICICI
* further tweaks
* further tweaks
* reverts weird sand behaviour code from ages ago
* oops
* universal adapter my beloathed
* nanomap moment
* webmap
* cere nanomap
* feedback updates
* updates
* airlock tweaks
* vents and tweaks
* solars moment
* triple APC fix
* south of where?
* airlock helpers
* disposal flap purge
* outpost monitor with actual real networks?
* tweakeroni
* fixes
* fixes
* tweaks
* fixes
* medbay improvements
* power and flaps
* changes
* aa changes
* fixes
* more fixeronies
* fixes!
* reversed
* chemicals
* chem tweaks
* fixes
* shuttle fixes
* holopad pass
* editseditsedits
* lightslightslights
* door
* /obj/machinery/computer/security/telescreen/entertainment
* sonic underground
* actual sonic reference
* Apply suggestions from code review
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* Tsrc
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
* start of mess
* reflect/parries works
* more pog-ress
* temp icons, .33 to 0.4
* more work, sound, rnd, fixes me breaking shields
* removes this since open pr fixes
* better codee
* attack log
* Final changes / sprites by ramon
* fixes issue
* shoot ramon for the white pixel :^)
* But what if it was a purple glass shard
* Fixes the throw parry
* sorry for so many commits, lower callback
* Apply suggestions from code review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
* Early return, no need to typecast
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>