Commit Graph

10274 Commits

Author SHA1 Message Date
matttheficus
2d455a4cbf aint this kinda funny? (#22139) 2023-09-07 10:53:16 +01:00
DGamerL
db1ed68a7d Tweaks some nuclear agent items (#22119)
* First changes

* Dont forget to do cooldown shit

* I HATE PEOPLE AAAAA

* Defib almost done

* Okay we ball

* Defib done

* I hate bullets

* Sniper done

* More stamina damage

* GDN review + Oops I forgor this

* Update code/datums/components/defibrillator.dm

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

* Disintegrate go brrrr

* Lewc review

* Ghhhhh

* Final oopsie fixed

* Almost made an oopsie daisy myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-07 10:52:48 +01:00
PopGamer46
50443325bf Adds Twimsts, a snack that can be used as eatable handcuffs (#22092)
* adds twimsts, the eatable handcuffs

* fixes twimsts cuffs showing up as cable on examine

* missing ending newline fix

* spelling

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

* list formating or something

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

* removes unnecessary bit of description, why did i put that there?

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

* 0 to FALSE

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

* path fix

* removes note showing wrong intent of adding code

* removes unnecessary examine

* code shortening, optimization, something?

* fix

* proper proc

* oops

* better sprites

* trash sprite not eaten?

* even better sprites

* removes extra empty line of code

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* fixes improper code formatting or something

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-07 10:39:29 +01:00
DGamerL
702893d02b Deletes the space worm (#22251)
* But every brave man wants to be wealthy

* even though it would mean losing thisgreattreasure
2023-09-06 22:19:58 +01:00
Adrer
9ce4886bc6 Fixes check for gravity generators on Z-level (#22239)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-06 19:59:22 +02:00
Cocacolagua
e8b693a26c fixed camera bug bug (#22230) 2023-09-06 19:57:23 +02:00
Adrer
40f5493b1e Changes clamp to use max_matter instead of magic number (#22195)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-06 19:08:50 +02:00
Contrabang
65ab4a5d89 Refactors station areas to be /area/station subtypes (#21681)
* areas

* progress...

* death hatred and murder

* get current master maps

* hoooly shit i can load up the maps

* it compiles now

* map changes

* fixes some unintended stuff

* make the .dme right

* fix mixed space+tab indents

* more space-tab fixes

* CI, please show me more than 1 CI fail at a time

* UPDATE PATHS!!!

* none of the stations had it anyways, but fixed

* mint wasnt actually deleted, my bad

* epic random CI fail for no reason

* i beg you, CI

* dont delete anything

* okay THAT should work now

* okay get master maps and rerun

* okay THEN run update paths

* actually done now

* oops
2023-09-06 17:37:50 +01:00
Burzah
c05f40b01c buckling runtime fix (#22204) 2023-09-01 18:32:30 -05:00
TaM-tHe-JaM
e07d63702c Islamic Garb - My First Contribution (#22040)
* abayacontribute

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* adding a slash

* Update code/modules/clothing/suits/hood.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* NVM didnt get deleted, didnt transfer

* tab fix

* removed comma

* Deleted unnecessary list, thanks DGamerL

* deleted

* finallymergeconflictgone

---------

Co-authored-by: Contrabang <91113370+Contrabang@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:33:44 +01:00
GDN
08eb183875 Gives the bartender their own version of judo (#21886) 2023-09-01 23:20:47 +01:00
Marm
7336750e48 Paramedic QOL - Lavaland Edition (#22154)
* paramedic grindset

Adds Paramedic headset with associated encryption key. Gives Paramedic mining access+supply comms. Adds Lavaland corpse related recovery equipment to Paramedic locker.

* goodbye soul hello garment bags

Adds a Paramedic garment bag. Cuts back on Paramedic locker clutter by adding crew monitor and crew pinpointer to loadout.

* headset, i barely know her

Paramedic headset moved out of garment bag and into main locker.

* lore???

Turns out I've been spelling Nanotrasen wrong all this time.

* Update code/game/objects/items/devices/radio/headset.dm

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>

---------

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>
2023-09-01 23:19:41 +01:00
Burzah
67901058ae Unum! The card game. (#22152)
* UNUM!

* distributing unum

* merch vendor

* Apply suggestions from code review

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

* color

* dmi update

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:18:37 +01:00
Silverplate
622dc36357 Updates the Supermatter Engine Book to act as a pocket guide for SM events (#22072)
* SM book updated (it only took like 5 years)

* Grammar police reviews

* Updates book to reflex hotfix
2023-09-01 23:13:04 +01:00
JimKil3
e29dab21f0 Buffs cryogenic anomalies (#22002)
* cryogenic anomaly buff

* setus vpeculator
2023-09-01 23:07:31 +01:00
Contrabang
b99db3d3d0 Allows for easier pulling onto beds and chairs, buckling someone stops anyone currently pulling them. (#21960)
* wham-bam

* oops
2023-09-01 23:04:04 +01:00
Sadhorizon
6aefc3fa12 VIP lockers now get more spare gear. (#21957)
* VIP lockers now get more gear

* all three bags
2023-09-01 23:03:10 +01:00
HMBGERDO
42c762ccd2 Using medicine on yourself on activate (#21955)
* now you can use patches, pills, injectors

* more supported meds

* apply proc
2023-09-01 23:02:34 +01:00
HMBGERDO
6d890ca3e6 No more accidental put baton on table/in backpack (#21946)
* fixing putting baton on the table by accident

* storage items support

* storage item check tweak
2023-09-01 23:01:12 +01:00
Henri215
e5ca69bd06 Ports some sounds for toolbox/briefcase/switch (#21938) 2023-09-01 23:00:36 +01:00
GDN
e9acb9fde4 prevents xenos catching thrown items they can't hold (#21766)
* prevents xenos catching thrown items they can't hold

* gogo gadget duplicate code

* trait solution
2023-09-01 22:37:09 +01:00
1080pCat
99f24119c5 yippie cyborgs and drones get them now (#21608) 2023-09-01 22:34:41 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
Burzah
20302523d9 guest pass cant be used on personal lockers (#22045) 2023-09-01 21:49:03 +01:00
GDN
6bf9bb963d readds baton throwing (#21481)
* readds baton throwing

* forgot this

* judo

* Update code/game/objects/items/weapons/stunbaton.dm

* Update code/game/objects/items/weapons/stunbaton.dm

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

* Update code/game/objects/items/weapons/stunbaton.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-31 17:54:07 +02:00
Contrabang
e754819607 Merges LAZYDISTINCTADD and LAZYADDOR (#22138)
* kills off LAZYDISTINCTADD

* Changes it to Distinct Add...
2023-08-28 15:44:56 +01:00
SchrodingersWolf
86a8690907 Added the Armored Suit Jacket to both the Uplink and as maint loot (#22011)
* 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>
2023-08-28 13:15:33 +01:00
tristan1333
37c46903d0 /obj/structure/alien/egg/grown has a prox timer now (#22106) 2023-08-26 10:26:18 -05:00
SchrodingersWolf
b820ced744 Removes unused slime jelly bloodcrawl interaction (#22022)
* Removes unused slimeblood bloodcrawl interaction

* Removed cult blood magic checks as well
2023-08-25 16:58:28 +01:00
Praveen Shinde
d07ca40d76 Fix: Typos with a crowbar and a sign #22033 (#22034) 2023-08-25 16:30:22 +01:00
Cocacolagua
6f8abfd3f7 fixes empty sandbags (#22071) 2023-08-25 16:17:07 +01:00
DGamerL
85b670b599 Fixes a flowering kudzu runtime (#22082)
* Wooooo

* Lewc review

* Tiny
2023-08-25 16:15:29 +01:00
DGamerL
e83412ddd3 [s] Fixes a stupid oversight (#22100)
* I HATE PEOPLE AAAAA

* Last change
2023-08-24 23:08:49 -05:00
DGamerL
0c0cf63608 I love afterattacks (#22028) 2023-08-23 21:12:43 -05:00
Luc
b5613d239d Adds a new Fungal Growth event, makes fungus re-harvestable (#21928)
* the fungus is amongus

* us -> al

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

fineeee

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
2023-08-21 20:02:27 +01:00
HMBGERDO
979935a7c9 Fixed Trick Revolver, Added Trick minibomb (#21915)
* trick revolver fix, trick minibomb added

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/game/objects/items/weapons/grenades/syndieminibomb.dm

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

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/game/objects/items/weapons/grenades/syndieminibomb.dm

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

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Burzah <116982774+Burzah@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: Burzah <116982774+Burzah@users.noreply.github.com>
2023-08-21 19:56:33 +01:00
Burzah
50bc2a2366 advtooluser dex messages (#21996) 2023-08-20 21:16:30 -05:00
matttheficus
597835b031 The TC Inflation Act of 2023 - No Balance Changes This Time (#22024)
* its time for me to make Hal cry again

* hal review
2023-08-21 00:20:47 +01:00
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
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
eedb4013c7 SILVEEEER (#22003) 2023-08-16 20:58:25 +01:00
Henri215
9836cf3196 The butler polling text for ghosts is now correct (#21992) 2023-08-16 20:46:59 +01:00
Contrabang
07fc90503b bam (#21979) 2023-08-16 20:46:11 +01:00
Burzah
b4e5e3f505 Radio Jammer can no longer jam across z-levels (#21954)
* jammer fix attempt

* oversight fix
2023-08-16 20:44:14 +01:00
1080pCat
d1d0effa0a Empty trashbags can now fit inside backpacks. (#21888)
* i think this is workin

* sillly me

* also this guh
2023-08-16 20:31:04 +01:00
matttheficus
7a7d3d8226 Gives the Bartender/Chef the Ability to Jump onto Tables Faster (#21885)
* and i saaaaid JUMP (JUMP!)

* logic moment + chef

* lewcc + contra reviews
2023-08-16 20:25:05 +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
Aylong
ceea2c54e5 tweak: Better stacks (#21861)
* tweak: Better stacks

* review changes

* del return

* that's it
2023-08-16 20:11:39 +01:00
Luc
2d80c8ec69 Prevents radios from working in certain admin areas (#21847)
* Add blacklisted areas for tcomms cores

* Blacklists some areas from tcomm cores

* this is better

* Update code/game/machinery/tcomms/tcomms_core.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-08-16 20:06:02 +01:00
Venuska1117
3db565f553 Add Railings "Caps" for Aesthetic Use. (#21803)
* Add railing caps
-subtype of railing corners

* Batch of changes:
- Fixed cap sprite
- Added 2 more instances of caps (left and right)
- Added caps to rods crafting menu
- Changed cost of corner from 3 to 2
- Added cost to cap, it cost 2 rods

* Woops:
- Apparently railings corners and such borrow code from normal railing so they always drop 3 rods.

* Change railings to list

* removed density/climbable
- they inhert it from railing
2023-08-16 19:58:57 +01:00