Commit Graph
127 Commits
Author SHA1 Message Date
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* 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>
2023-08-19 15:36:13 -05:00
DGamerLandGitHub b0b347660e The Rapid Syringe gun now costs 12 TC. It can also pierce all clothing now. (#21674)
* RATATATATATA

* We use TRUE, not 1

* making it cost 12

* making progress

* FINALLY

* Lewcc review

* Whoops this too

* Lewcc review

* Might work, might not, but conflict time

* Henri review
2023-08-16 19:52:02 +01:00
ff909adfb1 Adds Species Unique Traitor Gear (ready for review edition) (#21313)
* Vars and ideas

* Adds supercharge implant

* species specific tot gear!

* Adds vox spikethrower

* Adds Love injecting pen (skrell)

* sprite issue fix

* typographical error.

* makes pen not refillable, pacifies

* Adds fireproofing nanite injector (plasmaman)

* Lower KD on spikethrower per qwerty

* Lewcc review

* aaaa so much space indentation

* steelslayer review

* Steelslayer review

* Lewcc reviews

* Changes the spans

* Lewc review, Thanks to DG for doing my PR for me.

* Update code/modules/projectiles/guns/energy/special_eguns.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Henri review

* Forgot this one

* Whoopsie number 2

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 19:25:25 +01:00
matttheficusandGitHub 15c5acd05c Adds the Prototype Freedom Implant (#21759)
* FREEEEEEEEEEEEEEEEEEEEDOM

* stop showing everyone i copy paste my code smh
2023-07-24 15:53:54 +01:00
matttheficusandGitHub f48693ef4c Adds Fragmentation Grenades to the Uplink (#21726)
* boom boom pow

* ctrl + c / ctrl + v is bad
2023-07-24 15:42:11 +01:00
Coolrune206andGitHub 273438330b makes the chameleon projector cheaper (#21712) 2023-07-23 23:33:13 +01:00
ContrabangandGitHub 01889aae10 Buffs the Camera bug by adding hidden cameras (#21618)
* LETS GOOOOOo

* desc

* steel review

* ASYNC MAGIC!

* lewcc review

* i cant spell

* async
2023-07-23 23:28:56 +01:00
86874ce415 Adds the titanium push broom, a janitor-exclusive traitor item (#21496)
* adds it

* fixes the thing

* !! scope size increasing !!

* trait rename

* surplus removing

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* code review commit 2

* fixes a minor issue

* check_grep please have mercy

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-23 23:28:24 +01:00
QwertytofortyandGitHub 55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
4c1144db1d readds the mind batterer, fully reworked (#21193)
* readds the mind batterer, fully reworked

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* moer changes

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* sean review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-07-17 14:57:25 +01:00
ContrabangandGitHub 4bcb907e91 Gloves of the North Star now allow Martial Arts (#21545)
* gotns

* uplink desc changes

* gdn review + M to L
2023-07-17 10:48:17 +01:00
DGamerLandGitHub b77f369160 Changes the Tesla movement pattern [READY FOR REVIEW] (#20955)
* Slightly buffs the atmos backpack
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do
Increases the water cap of the atmos firefighting backpack from 200 to 500, to be more in line with the janitor cleaning backpack
<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->

## Why It's Good For The Game
Currently, nobody uses the backpack for anything other than metal foam, as the water capacity is simply too little for any effective firefighting, or nanofrost usage.
<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Testing
<!-- How did you test the PR, if at all? -->

## Changelog
🆑
tweak: Increased atmos firefighting backpack capacity
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->

* Maybe actually do what the PR says

* First attempt

* First stepos

* Cleaning up a bit, no errors :D

* fuck I have to redo the entire move code

* probably  won't compile, but I make other PR now

* something is fucky but I'm not fixing it now

* BALL STUCK BALL STUCK

* we making progress

* guhhhh

* moving over to getline() stuff

* yeetus your APCs are deletus

* removes variable that made Cl fail

* Steelslayer suggestions

* hotfix number one

* ANOTHER hotfix

* lewcc reviews

* new findeventarea proc

* Steelslayer review + Almost 100% sirryan review

* this should be all done now

* Hal review

* now 100% CI approved

* Hal review

* no more turf refs

* begone unused lists

* maybe actually delete the list

* doesn't runtime :D

* oops forgot this

* list gone and less runtimes

* steelslayer reviews
2023-07-15 11:11:14 -05:00
DGamerLandGitHub 887a5111df Adds confetti shot (#21462)
* CONFETTI CANNON

* proc and contra review

* sprite names

* nukie uplink and lewcc suggestions

* chemical fixed

* fixes party drums cost and chem explosion sound

* Henri review

* renames a datum because I copypasted shit

* changes a name because I copy pasted

* removes an extra space

* things I forgot + bundles + recipe change

* Oopsie + tones down the volume of confetti
2023-07-07 13:44:55 +01:00
DGamerLandGitHub 765c419feb Buffs Nanocalcium (#21476)
* The buffs

* snowball review

* Farie Review
2023-07-07 13:40:59 +01:00
SteelSlayerandGitHub 05c08aa01d Adds the Stealth implant, available to traitors (#21235)
* 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
2023-07-01 11:20:18 +01:00
matttheficusandGitHub 68406612fa TC up (#21473) 2023-07-01 10:42:53 +02:00
032b065214 Buffs the uplink thermal safe drill (#21312)
* commit stuff for safety

* making sure this shit saves

* I am commiting every 5 frames now, sorry. I lost 25 frames as the file got corrupted

* 45 frames

* 51 total frames now

* 55

* 65

* 70 frames

* 75

* 80 frames almost there

* Behold, a useful uplink item.

* removes debug message

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-06-28 15:38:55 +01:00
eb3b6758a9 Universal self assembling gun part kit (#21292)
* Universal self assembling gun part kit

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* universally avalible

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-06-21 22:45:52 +01:00
e6f8b543ae Refactors rocket launchers, adds it to nukie uplink (#21273)
* initial changes to rocket launcher

* moves the missiles to special projectiles

* gonna keep it real, im too high for mechcode

* missiles are now projectiles

* pt. 2 of last commit

* Now we don't need process fire to handle all this

* shoots you with my gun that makes you explode

* uplink time

* I hate mechs I hate mechs I hate mechs

* minor typo detected

* tech origin fix

* whoops the light ones explode twice

* THIS JUST MAKES IT WORK????

* maybe balance is a good thing

* Renamed ammo in uplink

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* sirryans reviews, ill learn to document someday

* Forcemove time

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-21 22:39:29 +01:00
ContrabangandGitHub 33a97a4c95 Synditele kit now comes with chameleon mesons (#21227)
* chameleon mesons

* sirryan review

* destroy + emp
2023-06-16 19:34:11 +01:00
matttheficusandGitHub 468088f402 you get a mag and YOU get a mag and YOU get a mag (#21300) 2023-06-15 21:23:02 +01:00
ContrabangandGitHub 5c0cb85c74 cqc price change + discount (#21249) 2023-06-14 21:10:49 +01:00
bdb8039c8f Adds gorillas and cargorillas (#20830)
* goril

* goril2

* arms

* goril3

* goril4

* rampaging

* emote

* trait

* more gorilla

* ooga

* Magillitis Serum Autoinjector, crates

* return to monke

* remove unused trait

* oops

* sirryan

* earth

* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/reagents/chemistry/reagents/misc_reagents.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* fixes and stuff

* gorilla text clarification

* tweak probs, stop if dead

* volume

* gorilla sleeping attack

* Apply suggestions from code review

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-06-01 18:36:07 -05:00
QwertytofortyandGitHub ac8eb9a046 Moves the posion bottle to the main uplink (#21088) 2023-05-22 22:25:23 +02:00
SilverplateandGitHub 73510a18ab Allows proximity mine signs to be used by all traitors (#20977)
* Removes jani mind requirement

* makes arm/disarm of jani sighs traitor only

* Adds mindslaves to usable mind states

* adds prox sign to surplus, standard proability

* Removes thralls from using sign (hacky method)

* allows mindslave useage (not hacky way)
2023-05-21 12:10:02 -05:00
QwertytofortyandGitHub 970b593e7d Makes emp bomb more useful (#21014) 2023-05-13 23:45:00 +02:00
ContrabangandGitHub db3252f9ee Splits traitor items and nuclear agent items into seperate files (#20620)
* commits a terrible file moving crime

* Updates for #20425
2023-03-29 19:51:05 +02:00