* 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
* starts it
* Update magic_tarot.dm
* MORE PROGRESS
* So many thanks to Cloudbucket, for sprites
* The Work, the Art, continues.
* more changes
* pushes the Work foward. All cards done.
* and more thanks github
* adds to BSH
* tochat
* Finishes QWERTYTODO. Magic key. World smoke
* Isaac and his mother lived alone in a small house on a hill. Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television. Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above. “Your son has become corrupted by sin. He needs to be saved.” “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life. Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins." “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world. One last time, Isaac’s mom heard the voice of God calling to her. “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you." "Yes Lord, anything!” Isaac’s mother begged. "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else." "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen. Isaac, watching through a crack in his door, trembled in fear. Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug. Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.
* nanny bag it before I forget
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* RE-RE-RE-REVIEW
* 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>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
* requested changes and such
* duh
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Update code/datums/status_effects/buffs.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* new hrefs here to troll CI :trollface:
* Update code/game/gamemodes/wizard/magic_tarot.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: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
* hell yeah-coded
* welp im too tired to fix this one
* lets test this
* Revert "lets test this"
* okay, lets test!
* fixes
* okay we good?
* i might be stupid
* Disguise self
Removing disguise doesnt work (fackin signals)
* fix signal, tweaks
squeak on clown disguise doesnt work right
* tweaks
icons are regen'd due to invoke async when the disguise is replaced
* 1.0
* move status to status_effects folder
* remove leftovers
* fix icon on break, increase cd
* Replace spell for stealth apprentice
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Update tgui.bundle.js
* Add icon by mcramon
* rebuild tgui
* remove old tgui
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* First buffs + More proper Status Icon
* Slight sprite change to look a bit less shit
* Additional tweaks
* Code consistency tweak
* Slightly higher price
* More tweaks and fixing a bug
* Brand new Icon courtesy of McRamon
* Tweaked icon a bit
* A bit more recommended code cleaning
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* how did i not notice this?
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Adds Bearserk combos
* Adds main Bearserk file
* Adds Berserker Bear Pelt to uplink items
Blacklisted from Nuclear and SST because Nukies always use modsuits, and SST won't be very stealthy if it's rocking the martial arts bear pelt.
* Update bearserk.dm
Minor tweak
* Update uplink_traitor.dm
Another minor tweak
* Update bear_jaws.dm
* Update paw_slam.dm
* Update smokey.dm
* Update uplink_traitor.dm
* Update bear_jaws.dm
* More Balance Tweaks
* Whoopsies forgot a thing
* Improved flavour text for Uplink
Please give a warm welcome to a new cult (that only exists in flavour); Children of Ursa Major!
* More Changes
* Updated flavour text for Bear Jaws
* Updated flavour text for Bear Jaws
* Added a bit of Smoh'Kie to Smokey
* Minor alteration
* Minor flavour text tweak
Made with love and copious amounts of vodka
* I had an even better pun idea
* Made cost identical to Carp
* Ticked the files
* Swapped the weights of Bearserk and Carp
* Moved some resistances to a status buff
* Fixed inexplicably formed code bugs
* More inexplicable code fuckery *scream
* Part 1 of Swapping weights of Bearserk and Carp
* Second part
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
I do agree the IsWeakened is rather redundant
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
* Added Suggestion
* Added Suggestion
* Added Suggestion
However, considering the && are causing check fails, this may be reverted
* Added Suggestion
* Added Suggestion, may be reverted if issues arise
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added Suggestion
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Removed Antag Checks on Equipping and Unequipping the Pelt
As per Contrabang's suggestion
* Added a Suggestion and sound for Bearserker Rage
* Added Suggestion
I like consistency, so thank you
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Added placeholder status icon
* Added Suggestion
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Added Suggestion
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Added Suggestion
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* 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>
* This should be most of it
* I forgor to push this
* Makes this look better too
* Slight last things
* This has to be 0
* Fixes everything being broken all at once
* Fixes ascension eating the owner
* Extra insurance
* Removes debug messages
* The most minor of optimalizations
* Sirryan review
* Cleaning up the files
* Update code/game/objects/items/his_grace.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Removes unneeded variables + Lewc review
* Ternary my beloved
* Checks the correct thing
* Less bloodthirst per second and back to 25 victims
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* some thoughts
* I really forgot to commit all of this didn't I
* Rework vendor crits
* fixes some angle jank
* yeag
* Patches up most bugs with tilting things over
* Fixes up most of the AI logic
* rolling AI can now take teleporters, visual effect is now only seen by the AI
* better effects
* Remove a bunch of now useless code
* I keep forgetting this
* cleanup in aisle seven
* oops
* some more testing
* adminbus hours
* Fixes some buildmode stuff, does some more testing
* Add documentation
* Demo bugs
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* rework crit damage amount
* Adapt recent tg changes
* Fix some small bugs in testing, contra review 1
* contra review 2
* Fixes tipping with pacifism
* restore removed icons
* Fix some remote untipping
* restore the roll action
* finally address contra's review (sorry)
* remove debug tool
* Move untilt logic into component
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* some tweaks for hardmode
* Update colossus.dm
* fail safes / other fixes
* oops pressed compile but had an active thing open
* bubblegum nerfs
* nerfs the self healing on guidance
* crusher bubble care
* and finally, the portal to the second arena, so a rescue might happen. Maybe.
* oh right the legion core related murders
* lets not make modsuit users suffer
* oops
* whoops
* fixes legion loot
* changes requested
* terminal smooth brain
* Update code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* comment
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* let the wall of errors begin
* alright that's enough for today
* more pain
* only 7 errors
* arena :)
* smaller arena
* slight cleanups
* okay we ask charlie for help tomorrow
* leap works
* okay we ball
* idk I'm just adding this for now
* WE HAVE A CIRCLEEE
* Charge back + timer!
* first steps of the buff
* more cleaning up
* Buff is progressing nicely, almost done
* OKAY WE BALL
* Whoops last things
* whoopsie forgot this
* 20 Stamina damage
* 150 blood now
* WE GOT ANIMATE IN THIS HOUSE
* we be impact immune now
* IT DOESN'T LOOK LIKE SHIT (and goes through walls)
* ok ship it
* Consistency
* I'm buying charlie a bottle of asda rum
* Okay, ready for review
* Henri + Hal reviews
* More reviews + I am stupid
* Charlie review
* Ohhhh so that's why it didn't work
* Yeet this
* Charlie review
* Comment
* Charlie review kinda
* Hal review
* DESECRATED DUEL WOHOOO
* Oops I changed this
* That's one thing done
* Lewc review
* Lewc review part 2
* Update code/__HELPERS/trait_helpers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Lewc review + ICON WOOO
* Aaaaaaa
* TGUI FIXED
* Henri review
* Charlie review
* Charlie review
* Henri review
* Jimkil review
* Update code/__HELPERS/game.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Charlie review
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update traditional CPR to loop automatically
* Implement most of the base stuff
* Bring over most defib changes so far
* Checks and fixes
* cleans up some leftovers, getting it ready for review
* Little bit of IPC flavor
* excludes non oxy-breathers, sorry!
* Better rescue breath handling
* Refactor revivability into a status effect
* Adds a little bit of feedback
* Removes the original variables
* Allows for CPR to activate cavity bombs
* Update code/modules/mob/living/carbon/human/human_mob.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* snake case time
* breathid instead
* remove unused proc
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Refactor mass heal out into a proc; readability
* Make user's healing particles more accurate
* Make target's healing particles more accurate
* Make Rod of Asclepius not waste heal points on healthy targets
* Let Asclepius Rod heal robotic limbs
* Fix simple animals sometimes not producing heal particles
* Fix Asclepius Rod not updating health after fixing burn wounds
* webedit temptation
* Remove redundant checks and healing from carbons
* Simplify silicon damage check
* Who wrote this
* Clarify two `if` checks
* I forgor
* Get this linter a True...
* Simplify? the simplemob health check
* Avoid healing if `health` is somehow > `maxHealth`
* Assume `heal_points` is always an int
* Fix human limb injury healing sometimes making `heal_points` negative
* Microoptimization
* 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>
