* More varied and balanced maintenance loot.
* linting
* assign updatepaths script PR number
* went a bit overboard with the trash
* get rid of varedited lootdrop spawners on maps
* Separate trash and food trash for mappers
* fix incorrect food/other trash statistics
* TM feedback tweaking round 1
Significantly lower occurrence of all tier 2 items.
* allow randomizing angles, use for litter
* move trait delta to define, bump loot chance 10%
* Diverse Traders Types
* Trader Type control, announcements, species spawning
* Trader Outfits
* Posh Moth - Posh Cane
* Landmarks, Trader ID Name Change
* Trader Shuttle Adjustment - Landmarks for Item Pools
* Outfit Survival Kit changes
* Added another refill for the hand labeler due to more cargo
* Trader Shuttle locker fix
* Item Stocks, Item Stock Assignments, Box Kits, Love Bottle
* Mech access, No double mechs, Small box fix
* Removed Solgov Gunkit from General Pool
* Spacing
* Moved traders to not be event subtypes, added documentation to vars
* Boxed spacing, removed improper
* Moved postequip, used box variables
* Lore team requested change - Bolt action instead of AK
* Changed landmark
* Moved soviet ammo to minor gear, increased soviet minor gear to 8.
* Obfuscated Cybersun
* Lootpool Adjustments
* Readded Solgov Kit to general pool at low weight
* Commas!
* Spelling
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Comments
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Re-Nulled After_Equip_Job
* Removed extraneous var spaces
* Relocated space in trader introduction message
* Robomoon is now once again Cybersun
* Impropered Enforcer Kit
* No more ERT box for non-NT boxes
* Fixed turbine kit stock part amount
* Subtyped skrell/unathi suit boxes
* Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons
* Reduced weight on arm/esword implant rare items
* Also reduced arm laser weight
* Added a couple items to skipjack large - more 'random', filled in reduced weights
* Path typo fix
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed trailing / in path
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Removed Cheap Breacher suit from inventory
* Apply suggestions from code review
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Created Knuckledusters.dm
Time to see if this shit works
* Correct file now
I forgot to add .dm after making file. Oopsies.
* Delete code/game/objects/items/weapons/knuckledusters
Wrong file
* Fixes code and addes sprites
* Finished sprites, dusters can now be gotten
* Tweaks and fixes and additions
* Uplink description tweak
* Now they do more, thanks Snowball for help
* Syndiedusters look good now
* Tweaked values, added Engraved Dusters as steal objective
* Further tweak
* Removal of unnecessary space
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Tweaks from Henri added
* Gave admin variant new root name
* Autodocumentation of variables
I feel like an idiot not knowing how to autodocument, but feeling like an idiot is worth it so long as I learn
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Added some suggested changes/code cleaning
* Removes unecessary space, how do I keep missing these?
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* 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>
* Added the armored suit jacket from the Agent 47,
Bond and Professional Bundle to the Uplink. Also
allowed it to be spawned as maint loot.
* Messed with main loot drop values
* Telecrystals son, they increase when exposed to inflationary pressure
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
---------
Co-authored-by: Burzah <116982774+Burzah@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>
* Janitorial equipment tweaks and advanced cleaner
* cleaner availability tweaks
* old cleaner for drones
* Mop capacity buff
* advanced cleaner for sol traders
* conflict part 1
* Merge branch 'master' into janitorial_tweaks
* Revert "Merge branch 'master' into janitorial_tweaks"
This reverts commit 47129ea819.
* Revert "Revert "Merge branch 'master' into janitorial_tweaks""
This reverts commit a8c520b069.
* hahahahaha
* hahaha part 2
* hahaha part 3
* cerestation edit
* adv cleaner comes with 500 now and ERT belt
* lube spray upper case and moving it to spray.dm
* Medical and RnD DMI files split
* Cargo DMI split
* Security DMI split
* Engineering DMI split
* Captain DMI split
* Civilian/service DMI split
This one hurt
* Forgot about this one
* Color DMI split
* Purges everything that was delted up until this point
... with a blindfold and a shotgun
* Dress and suit DMI split
* Pants and shorts DMI split
and merges pants and shorts files... shorts are pants, right?
* Donator/fluff jumpsuit clothing organisational relocation
* e
oops
* So this is used, repath bad
* Random commit
* Costumes DMI split and jumpsuits purge
* Some fixes
* pennywise
* Centcom DMI split
* SolGov DMI split
* Retro DMI split
* Syndicate DMI split
* Misc DMI split
* centcom officer
* Kills off uniform.dmi completely
* last fixes
* lastest fixes
* vox navy gold conflict
* civilian barber
* Tourist observers work now
* Hopefully working non-human humanoid clothing
* This being in suit.dmi is one of the reasons I made this PR
* This shouldn't be here
* Late night coding
* Pun Pun regains his drip
* Last fixes
* security/OFFICER
* Most important - clown fix
* working subtypes good
* Fixes chameleon jumpsuit
* Proper QM pathes
* Fixes jumpsuit rolling with the power of poor quality code
* Cargo tech character setup fix
* else instead
why didn't I do this in the first place
* PURP
* Fixes broken character setup job clothing
* CC suit fix
* Psychedelic jumpsuit proper path
* You must wear the jumpsuit to adjust it
* Go fish
* Keep forgetting about the map
* Forgot about the sprites for the double deck
* Cleaned things up
* Fix icon conflict
* Update cards.dm
* Improper tweaks
* Update cards.dm
* Axing the popup from the toy version entirely, that was a little jank
* Meta remap was merged
* Huh. \improper was the issue.
* Update cards.dm
* Few changes and a fix
* More changes
* Update cards.dm
* Update cards.dm
* Update cards.dm
* Merge branch 'master' into go-fish
* Update cards.dm
* Converts Eye Augments to Cybernetic Eyes
* literally not used
* it helps when you properly include all the code
* flashlight eyes
* tweaks
* conflict resolution
* can't have two eyes
* order of operations matters here
* autosurgeon
warriorstar-orion