Commit Graph

26638 Commits

Author SHA1 Message Date
Qwertytoforty
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
DGamerL
9108007709 Fixes a runtime related to the RSG (#22021)
* The fixening

* Finally done
2023-08-19 13:48:27 -05:00
Charlie
f0afff8b62 fix (#22019) 2023-08-17 18:00:10 -05:00
Qwertytoforty
aad8529c24 Removes swiftness, add speed potions back as oil slick potions (#20939)
* Removes swiftness, add speed potions back as oil potions

* no shorting, icon update on mob

* early and forgotten returns

* ramon oil colours

* Update code/modules/research/xenobiology/xenobiology.dm

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

* no more slipery vehicles, now slippery tables

* just because it compiled the first time doesn't mean the second list will compile idiot

* icons my hated

* bottle4

* cleaner up

* qwerty my man what you doin: s34n 2023

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 21:07:39 +01:00
DGamerL
ba8ee65477 Do you have the stupid (#22004) 2023-08-16 21:05:55 +01:00
Qwertytoforty
195800fd59 supermatter gets darker as it delams, rather than brighter, below 50% it darkens the area (#21639)
* supermatter gets darker as it delams, rather than brighter, below 50% it darkens the area

* invert logic

* removes excess lines

* removes else and returns

* fixes bad return
2023-08-16 20:48:23 +01:00
GDN
6eb57a98c7 fixes ais being unable to use cameras after an emp sometimes (#21974) 2023-08-16 20:45:10 +01:00
Furior
e817ddba46 Fix: global proc procall (#21949)
* Fix: global proc procall

* rem: additional wrap in sdql call
2023-08-16 20:42:17 +01:00
GDN
ac5901be6a lavaland sliding puzzles now spawn normal mining chests (#21930) 2023-08-16 20:40:18 +01:00
Daylight
6cc5d126da This massive refactor took over 2 hours to develop (#21926) 2023-08-16 20:39:51 +01:00
Daylight
1434695e9f Robot Names Can No Longer Be 0 Characters Long (#21907)
* Add minimum length + warning

* Remove nullcheck

* The Minimalist Code Initiative
2023-08-16 20:39:17 +01:00
Nathan Winters
c0def97ec3 Minor Chem Master tweaks (#21904)
* Make chem dispenser transfer to beaker by default

* Fix chem masters' default product name when supplied invalid product number
2023-08-16 20:34:07 +01:00
warriorstar-orion
57c96cea9a fix issues with manual sec record entry (#21882) 2023-08-16 20:23:51 +01:00
DGamerL
f3267d4325 Adds an orderable random plushies crate for 1000 credits (#21878)
* ok one second I gotta do something else

* Okay we ball

* Okay we are stealthier now

* Does this work? I have no idea.

* So cloooose

* I don't know what the fuck I am doing

* IT WOOOOOOORKS

* Contra reviews

* oops

* Contra review

* Now it actually works
2023-08-16 20:20:58 +01:00
GDN
7378a15e21 Fixes mmis being unable to use mech actions (#21855) 2023-08-16 20:06:53 +01:00
Luc
45e9b85366 Fixes embed surgery on IPCs not working (#21848)
* Fixes embed surgery on synths not working

* Oops

* owner -> victim
2023-08-16 20:06:35 +01:00
Luc
b7f0f60364 Adds some fresh new emotes (#21828)
* Adds some fresh emotes

* Adds necessary keybinds

* oops

* to_chat moment

* but here's the Thing

* Update code/modules/mob/living/carbon/human/human_emote.dm

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

* Add missing name

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-08-16 20:04:11 +01:00
Adri
49ed4ac4d1 Improves PDA logging, fixes message monitoring console input issues (#21763)
* Better PDA logging, fixes sanitisation issue

* Adds sanitisation and max length to every input

---------

Co-authored-by: Miraviel <Miraviel@users.noreply.github.com>
2023-08-16 19:54:34 +01:00
Luc
d75d20b907 Makes things dust when the SM bumps them as well (#21677)
* Add bump

* nah

* Add examine text to note it can be wrenched safely.
2023-08-16 19:52:38 +01:00
DGamerL
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
larentoun
4efc40ccac [FIX] Jobbaned can't spam-spawn as cult harvesters (#21656)
* fix: jobbaned can't spam-spawn as cult harvesters
https://github.com/ss220-space/Paradise/pull/1283

* fix: oops, what is this check?

* smoke needs create_smoke
2023-08-16 19:50:21 +01:00
Silverplate
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
Charlie
d54ac7720e Ports the martial art combo counter from TG (#21943)
* c-c-c-combo

* sean review

* farie review
2023-08-16 18:44:01 +02:00
Venuska1117
a1c9f95a3f Blacklist "Forsaken" Cat from Gold Extract Spawn. (#21852)
* Fix Forsaken Cat spawn from Gold Slimes.

* Typo

* ???

* eeehhhh... no funky text
2023-08-15 14:51:20 +01:00
DGamerL
c2f9228988 [s] Fixes several clingspider related runtimes and fixes spiderlings growing into infestation spiders (#21988)
* The fixes

* Steelslayer review
2023-08-14 20:52:15 -05:00
Henri215
b39f1ed204 Fixes non humans having white blood (#21984) 2023-08-13 18:48:35 +01:00
Sadhorizon
f4867108a0 Fancy ants: kidan suit sprites. (#21922)
* stuff

* all of the suits
2023-08-12 19:30:46 +01:00
benjicoots
cc13c52fed Make air alarms start with the correct default state when placing the… (#21635)
* Make air alarms start with the correct default state when placing the frame

* Update code/game/objects/items/mountable_frames/air_alarm_frame.dm

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

* undefs to allow CI passing

* define moment

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-12 19:27:42 +01:00
DGamerL
0b5a3e692f Vampires now don't get toxin damage from drinking a wrong blood type (#21776)
* normal blood works

* slime jelly

* this is now cleaner

* also this is a bit cleaner

* Hal review

* Hal review

* now slime vamps won't get double the blood
2023-08-12 18:57:21 +01:00
Evаn Summers
cf2a4380f6 Fix: stop magic staff recharging while already at max charge (#21692)
* Fix for staffs recharging while at max charge

* Update code/modules/projectiles/guns/magic.dm

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

* Update code/modules/projectiles/guns/magic.dm

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

* Update code/modules/projectiles/guns/magic.dm

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

* Update code/modules/projectiles/guns/magic.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-08-12 18:51:22 +01:00
Deniz
7e712e2d29 [TGUI] BotStatus.js for tidier TGUI code for bots (#21631)
* Cleanbot merge

* botstatus update

* TGUI Bundle

* TGUI Bundle

* bundle
2023-08-12 18:50:07 +01:00
Contrabang
5c18bbeedf this was a hard one (#21598) 2023-08-12 18:45:14 +01:00
DGamerL
121603c825 The sleepy pen, hypospray and RSG will now all do initial chemical reactions when they inject a chemical (#21722)
* fuck it we ball

* I hate math

* Updates people, updates (also jimkil review)

* okay this should work better

* Will it work?
2023-08-12 18:41:28 +01:00
JimKil3
eb69f11a1b Adds RTS-like camera controls to AI (#21625)
* REMOVES sillycons (their keybinds)

* adds the feature

* comment fix

* mech fix

* lewcc review
2023-08-12 18:38:10 +01:00
Qwertytoforty
823ca7570a cryo vetus slip nerf (#21865) 2023-08-12 18:24:50 +01:00
DGamerL
d27b36d021 Slightly refactors makeTrail() and adds a few comments (#21863)
* The refactor

* Gaxeer review

* Some more reviews

* Last Gaxeer review

* Moving around the comments a bit

* oopsie

* Sirryan review
2023-08-12 18:24:30 +01:00
warriorstar-orion
70dfb4ef6c feat: make scrambled trinary appear compressed (#21837) 2023-08-12 18:23:21 +01:00
GDN
36d6c0f967 false alarm now sounds the sirens (#21773) 2023-08-12 18:22:56 +01:00
1080pCat
34622bcfe4 16 minutes is way too long (#21741) 2023-08-12 18:22:36 +01:00
Contrabang
b1eda77f01 Adds happiness (a new chemical) (#21718)
* Adds happiness

* epic linter fail

* epic comma fail

* fuck i forgot to change the name

* deconflict it PROPERLY

* jimkil review
2023-08-12 18:22:18 +01:00
Qwertytoforty
4748736c9e Ports TG staff of storms / updates sprites (#21566)
* Ports TG staff of storms / updates sprites

* I *said* it *doesn't* work in SPACE!

* Update legion_loot.dm

* requested changes

* icons fixed
2023-08-12 18:20:57 +01:00
Eric6426-Blossom
66374af694 ClingspiderRework Revival (#21435)
* ClingspiderRework Revival

* No sentient pots

* HenriReview

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

* ChangesP1

* ChangesFix(I'm dumb)

* Fix(?)

* Revert "ChangesP1"

This reverts commit 91d340dc95.

* lewcc review

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

* ChangesP2

* GibGib

* Le text

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-12 18:20:19 +01:00
warriorstar-orion
c45b8edb0f Fix two typos. (#21965)
* Fix one typo and two invalid job map entries.

* Fix IAA, add stacktrace call.
2023-08-12 10:44:28 +01:00
Qwertytoforty
bcce813e0a Beanbag shot now throws a tile. Increases the spread on rubbershot / lasershot / weakbuckshot (#21501)
* Beanbag shot now throws a tile. Increases the spread on rubbershot / lasershot / weakbuckshot

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* makes it compile, uses starting.

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-08-11 15:35:16 +01:00
efzapa
92db3304e5 Adds the Bluespace Shotglass (now with actually good codersprites) (#21867)
* blamo new branch new PR

* fixes update_name

* changes BSS sprite

* adjusts RnD levels a bit
2023-08-11 15:34:34 +01:00
Burzah
f599d87dcf Fixes blumpkin juicing (#21947)
* blumpkin juicing fix

* there can be only one
2023-08-11 15:34:23 +01:00
Henri215
4398e2c003 Fixing common spelling mistakes part 4 (#21945) 2023-08-10 17:27:20 -05:00
DGamerL
f9b274cc9d Fuckfuckfuck (#21944) 2023-08-10 17:16:35 -05:00
DGamerL
cdef637e7f Stops guardian spirits from being buckled (#21896)
* the fix

* We use defines now
2023-08-07 22:45:29 +01:00
Contrabang
ce8c7fa55b Fixes some issues with the debug menu (#21600)
* fixes debug menu

* guh, scuffed implementation

* user.client -> parent

* deconflict

* please fix it? executable?
2023-08-06 04:13:27 -05:00