Commit Graph

623 Commits

Author SHA1 Message Date
Manatee
ed09aa658d Removes mod disks from loot pool, and makes them orderable from cargo. Also adds a KA crate. (#17739)
* fug

* no more disks
2023-02-11 03:18:18 -06:00
ynot01
4eef4acae8 Science Security & HoS can now enter robotics & xeno (#17663)
* sec to robo they making gygax

* hon

* breaks everything

* Update access.dm

* Update access.dm

* gives them xenobio too bc jamie said so
2023-01-27 19:19:02 -05:00
ynot01
118dec69a8 Security nerf: Mindshield firing pins no longer printable (#17634)
* fpin nerf

* Update packs.dm

* Update packs.dm
2023-01-27 19:13:13 -05:00
Skrem_7
c8a7d24080 goodbye wt (#17590) 2023-01-22 17:04:20 +00:00
ktlwjec
f15f5c6938 more pizza (#17523) 2023-01-17 11:55:44 -05:00
Jamie D
9745a92b81 Sorry Molti and Bibby, Im stupid, this should fix me not doing your comments (#17451)
* e

* e

* oops
2023-01-11 17:14:36 -06:00
Jamie D
ad37bce824 Nerfs Cargo - No more Factorio Simulator Free money exploit 2023 (#17414)
* e

* Update autolathe.dm

* OOPSIE 2
2023-01-11 00:21:58 +00:00
Byemoh
0e309e5a82 NT-USP - American Security - How I Learned to Stop Worrying and Love the Gun (#16414)
* gun

* vendor

* remove disablers from jobs

* poop

* maybe spell it right

* asteroid + gax

* armory

* bye to all your ammo if you get heavy EMP'd

* bald

* sprite adjustment from orca feedback

* ammo change + vending change

* pixel perfect

* Update ArmamentsDispenser.js

* if this works you owe me an antag token

* maps

* Update rechargable.dm

Co-authored-by: ynot01 <ynot000001@gmail.com>
Co-authored-by: Chubbygummibear <kullen.ds@gmail.com>
2023-01-07 14:06:44 +00:00
Jamie D
e5c20dcc3a [TG UPDATE] 7 - THE GREAT FIXENING EDITION (#17341)
* Fixes Settings

* Fixes MFA

* [SPR part 6] Admins can now edit reverse pod delay times (#53833)

* convert delay vars to a list, UI changes

tgui bundle

Bugfix

* Rebuild tgui

* e

* tgui: Fix issues detected by SonarQube (#55098)

* tgui: Fix issues detected by sonarqube

* MacOS compatibility

* Rebuild tgui

* Working

* Working

* MOAR

* e

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2023-01-05 20:21:45 +00:00
Jamie D
37a75475ad [TG UPDATE] 4 - TGUI - WOULD YOU LIKE TO UPGRADE TO THIS EDITION? (#17311)
* e

* https://github.com/tgstation/tgstation/pull/55157

* manual

* Replace alert usage with tgui_alert (#58419)

Pretty much every alert() call is replaced with tgui_alert, except one I replaced with tgalert as a fallback. If tgui_alert exists, why not use it?

* e

* e

Co-authored-by: Celotajs <81999976+celotajstg@users.noreply.github.com>
2023-01-04 15:52:06 +00:00
TheRyeGuyWhoWillNowDie
b414c4d1ad e (#17261) 2023-01-03 01:42:32 -06:00
Ling
17c5a68c33 Backports several SSmapping improvements (#17208)
* Optimizes SSmapping

* Turfs inside area are stored

https://github.com/tgstation/tgstation/pull/70966

* Add async reserving of turfs

* Fix bug

* Fix shuttle init
2022-12-31 15:41:47 +00:00
Ling
beea06de4b Allows purchasing of air scubbers & pumps (#17145)
* Allows crafting and purchasing of air scubbers & pumps

* No fun allowed

* Add huge scrubber cargo order

* Revert "Add huge scrubber cargo order"

This reverts commit c87bba8870.
2022-12-29 22:40:51 +00:00
Theos
61f6dbb0c3 fixes coffins being worth substantially more than they should be (#17119)
* fixes coffins being worth substantially more than they should be

* Update large_objects.dm
2022-12-19 20:19:52 -06:00
Bop
6de59ad0fe Supermatter shard engine is now buildable + new cargo bounty (#16890)
* fix gas priorities

* dumb

* .

* Update gas_mixture.dm

* Update gas_mixture.dm

* amongus

* fix

* sm shard go brrr

* guh

* done

* notice

* new sht

* yeah!!!!

* good bounty

Co-authored-by: Simplehorror <101573582+Simplehorror@users.noreply.github.com>
2022-12-17 14:38:42 +00:00
Manatee
74db88bb95 its technically a weapon i guess? an explosive? (#16625) 2022-12-05 23:05:37 -06:00
Molti
55d5f60cfe Science Night Vision Goggles (#16222) 2022-10-29 15:22:21 +01:00
ChesterTheCheesy
4aa6c0b45d either destroys the entire game, or increases performance... maybe both (#16178) 2022-10-29 15:02:44 +01:00
adamsong
fa832b902f [Port] Doing mail again (#16147)
* port: cargo mail

* fix: forgot .dme file in commit

* chore: fix lints

* add postmark/stamp icons

* setup delta_time

* more of the port

* more job goodies ported

* fix sec officer

* fix some tg->yog stuff

* fix check for station faction

* only remove the waiting mail amount that was actually delivered

* fix fake nude code being obvious and check if code is already set

* fix variable name

* re-add strange reagent for HoP

* more atmostech goodies

* station engineer goodies

* warden goodies

* more goodies

* Adds null check

* Fixed small parcels not being mailable, and set the default sort for junk mail to disposals

* Makes lootdrops drop loot in the same loc in which they are, rather than just on the floor

* add purple hat icon

* fix: envelopes with two items should give both now

* fix: mail amount was using incorrect calculation

* fix typo

* Fuck your tails

* Why didn't these commit?

* Added debug verb to dump loot

Co-authored-by: Inari Whitebear <inari_whitebear@fastmail.jp>
2022-10-29 14:41:40 +01:00
Vaelophis Nyx
5b6dbf5b37 Adds Gummy Bears To Chem Master, Cargo, And More (#16024)
* mmmm gummies

* done

* god

* e

* Update uplink_items.dm

* Update uplink_items.dm

* Update medical.dm

* asfa

* Update negative.dm

* experimental pills-in-big-bottles?

* Update negative.dm

* Update gummies.dm

* oops

* Update chemical.dmi
2022-10-22 13:16:29 +01:00
Bop
f448bee179 [PORT] Axolotl (#15978)
* crap shit

* guh

* fix shit

* hug

* f

* mmm ai holopad axolotl

* change

* whhoops

* cool sound

* adds held icon sprite

* crazy shit

* spin bop spin!!

* forgot .

* no spinning while resting

* sh
2022-10-08 14:48:26 +01:00
AlvCyktor
c510c18646 Fishing Overhaul!!! (+seafood) (#15036)
* leech

* Update bait.dm

* Shazam!

* COOK THAT FISH

* updates wild bait sprite

* recolor

* Bluespace bait

* fixes fishing vendors not having a circuit board

* actually does that better

* chef powercreep time

still need the sprites, but hey, it compiles

* whoops

* Update snacks_seafood.dm

* fried rice sprites

* updated per request of cuackles

* taiyaki ice cream cone & deluxe ice creams

* actually adds the new files to the dme.

also ice cream has different food groups now

* revert changes to icecream_vat.dm

* missed one

it's JUST the ice cream flavor foodtypes now

* kill me

* reverts kitchen.dmi change

* taiyaki take 2

* desc fix

* COMMAS MY HATED

* fixes blue taiyaki

* Update food.dmi

* fish pizza box

* puts that in the crate

* leech

* Update bait.dm

* Shazam!

* COOK THAT FISH

* updates wild bait sprite

* recolor

* Bluespace bait

* fixes fishing vendors not having a circuit board

* actually does that better

* chef powercreep time

still need the sprites, but hey, it compiles

* whoops

* Update snacks_seafood.dm

* fried rice sprites

* updated per request of cuackles

* taiyaki ice cream cone & deluxe ice creams

* actually adds the new files to the dme.

also ice cream has different food groups now

* revert changes to icecream_vat.dm

* missed one

it's JUST the ice cream flavor foodtypes now

* kill me

* reverts kitchen.dmi change

* taiyaki take 2

* desc fix

* COMMAS MY HATED

* fixes blue taiyaki

* Update food.dmi

* fish pizza box

* puts that in the crate

* fixes typepath

* sprites

* Update food.dmi

* Update food.dmi

* Update food.dmi

* Update snacks_seafood.dm

* Update snacks_seafood.dm

* changes

* Update recipes_bait.dm

* shrimp tempura

biome wanted it

* cevich sprite

Co-authored-by: Vaelophis Nyx <vaelophisnyx@gmail.com>
2022-10-08 14:28:39 +01:00
Theos
5228d4aeab Gems now orovide their mining points when sold at cargo, and are claimed with the id card rather than mining scanner (#15964)
* someone fucking broke tails again thanks guys

* gems provide payment via id scan and only on being sold

* Update gems.dm
2022-10-07 19:22:40 -05:00
Bop
35b86df383 Revert "Revies #15961 please reconsider (#15972)" (#16004)
This reverts commit 081067b735.
2022-10-01 13:46:03 +01:00
Bop
081067b735 Revies #15961 please reconsider (#15972)
* no more

* no more

* fuck

* ja

* fuck yeah

* uhh i think it should be fine now

* ok
2022-10-01 13:37:27 +01:00
Skrem_7
05f6818e94 The Ballistics Expansion (#15675)
* Gee I sure hope this PR never stacks an obnoxious number of cornflakes that force me to make a new PR

* forgot to adjust metalshock description

* i forgot to change magtype of the boarder!!

* USE your sprites damnit

* redundancy my beloved

* mild number tweaks

* first patch

* second patch

* small sprite changes

* third patch

* bullet speed patch

* gives ap to wt incend since it doesnt inherit it unlike the rubber

* makes trac less bad

* minor description oversights
2022-10-01 12:37:37 +01:00
GraveHat
7d7647a166 [PORT] Adds in Alligators from Shiptest and adds in a Gator Crate (#15770)
* what's a crocodile

* gatormade

iguana slaps too

* Duplo

inheritance
2022-09-30 23:16:33 +02:00
Vaelophis Nyx
13a0eff1c5 Partially Reverts #15197; AND adds portable disco balls to cargo (#15939)
* .

* Update packs.dm
2022-09-30 21:04:09 +00:00
Redmoogle
a91ef5c4bf Datum lighting (#15931)
* Turns lighting objects into a datum, makes all lighting be performed with an underlay. big maptick fix very good! (#58991)

credit to zewaka for the idea of using underlays

turns the lighting object movables that were unnecessary and increased maptick into a datum which then applies and removes an underlay in update(). also applies a lot of general lighting clean ups (mostly using as anything in loops and fixing single letter var names).

multiz is a little different by necessity, now only the bottom turf's lighting matters in the brightness of the top turf unlike master where the bottom turf's lighting object is hidden from the vis_contents of the top turf. there are still some kinks to iron out here though, since currently objects suspended in openspace (like tram platforms) look bad and glass floors look bad too

only thing i have left to do is make multiz work (well)

UPDATE: multiz now appears the same as far as i can tell, its possible there are other situations in which its different but datum mats work and it automatically updates if the turf below changes. now i just need to make the system less finnicky if at all possible (and possibly merge managed_turf_vis_content with managed_overlays maybe?)

new update: its basically equivalent to normal multiz as far as i can tell (visually at least, in the circumstances ive tested so far)

NEW NEW UPDATE: turfs no longer have the VIS_HIDE vis_flag and multiz works without stacking the lighting from the floor below! so this shouldnt have any overt drawbacks to master anymore

1 needless movable per tile is terrible for maptick. this is probably a larger improvement than my emissive blocker change in terms of maptick. im guessing we'd get around 0.6 average maptick per player after this where currently we get 0.85 or so

Edit: according to lemon, sybil reached 0.71 maptick per person when tm'd with this

if this is a big enough improvement i might finally be able to get rid of the Gone discord avatar

* Revert "Turns lighting objects into a datum, makes all lighting be performed with an underlay. big maptick fix very good! (#58991)"

This reverts commit ffbbeb64f4.

* port from another codebase

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2022-09-30 19:54:14 +02:00
Skrem_7
67dc6e13bd deletes lavaland lizards (#15955) 2022-09-28 21:52:37 -05:00
Vaelophis Nyx
ddc634fa06 Makes Changes To Venomous Mobs* (#15745)
* venomous creatures should be venomous.

* Update giant_spider.dm

* Update giant_spider.dm

* e
2022-09-23 16:54:07 +02:00
Vaelophis Nyx
b01bf98336 Baseball Bat Rework + New Bats (#15555)
* initial commit

* commit 2

* commit three

* Update misc.dm

* Update misc.dm

* Update weaponry.dm

* Update weaponry.dm

* less OP

lmao

* only metal bats have knockback now

* black sprite

* twohand that bat

* fix the repath

* repath repath repath

* durability only goes down when you hit mobs

* sprite update

* wooden toolbox now

* Update twohanded.dm

* Update twohanded.dm
2022-09-17 12:23:21 +01:00
TheRyeGuyWhoWillNowDie
4d7bf5b313 Working mech DLC: Clarke and KA (#15626)
* its here

* Update clarke.dm

* Update code/game/mecha/mech_fabricator.dm

* Update code/game/mecha/mech_fabricator.dm

* Update code/game/mecha/mech_fabricator.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-09-10 19:17:05 +00:00
Redmoogle
0f278cd4cd Cargo requests can be approved again (#15599)
* fixed

* Update Cargo.js

* fix minor bug where request console shows cr0
2022-09-10 20:36:25 +02:00
Byemoh
66d7c1c636 Adds minor gems to lavaland, adds gem bag, and makes unscanned gems shine (#15591)
* gems

* Update minerals.dm

* Update gems.dm

* icon fix
2022-09-06 16:20:17 -05:00
ynot01
9a1aadf928 fixes snowflake unmodular ID checks (#15596)
* GetID

* Update expressconsole.dm

* Update mech_fabricator.dm
2022-09-04 15:50:11 +01:00
Skrem_7
bdcd183e62 oops i had an idea (#15515) 2022-09-04 14:04:23 +01:00
Vaelophis Nyx
7f62e8a941 Renables & Improves Stalwart + Fixes Stalwart's Loot Drop & Improves It + Adds New Stalwart Drops (#15476)
* readds stalwart to the megafauna list

big metal man returns

* holy shit

big fixes

* Update energy.dmi

* Update plasma.dm

* big changes

* Update stalwart.dm

* Update necropolis_chests.dm

* why dont you go wield some bitches

stalwart staff wield changes in prep for new sprites

* Update stalwart.ogg

* Update stalwart.ogg

* Update machine_vending.dm

* Revert "Update machine_vending.dm"

This reverts commit 20dd3c5305.

* Update stalwart.ogg

* Update stalwart.ogg

* Update stalwart.ogg

* shazam!

* Update gems.dm

* 1

* Update stalwart.dm

* forgor the bounty

* oops

* Update plasma.dm
2022-09-04 13:52:55 +01:00
GraveHat
ff356b265e Ports Gems from Shiptest while giving them new features (#15244)
* Ports Gems from Shiptest

This also somehow involves adding in 2 new features.

* Apply suggestions from code review

Descriptions are Updated, still working on getting the cargo bounties and export bonus mining points.

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* Gem Bounties and Megafauna Cash Scale nerf

Adds in the gem bounties I finished 3 days ago. Also the free Cash that you get from killing megafauna gets nerfed because no one knew they existed in the first place. Also fixes some formatting.

* Price Adjustments and the Descriptions

I build.

* Names were mismatched for some reason

Metastable < Stabilized

* Apply suggestions from code review 2

Description drop.

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

* New Sprites, new gems and moving things around

Replaces the sprites of all the gems
Moves around code to be in order of magnitude
Adds in the Calcified Auric, the less valuable glowing counterpart of the Frost Diamond.
Adds in the Densified Dilithium, the signaling gem of the Hierophant.

* Desc Update 3 I think?

Thanks Lore Director, you the man. I would make a thumbs up but I'm bad at emoticons.

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>

Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
2022-08-29 13:55:42 +01:00
nmajask
719bdc8ca2 Port s NIRN/bounty board, tweaks budgets, and other small modular computer things (#15019)
* nirn, bounty board, and other things

* oops

* oops x2
2022-08-20 23:53:22 +01:00
Redmoogle
8d73af6dec Nerfs mining progression somewhat (#15314)
* Too easy

* nerf these too

* Update progression.dm
2022-08-20 13:38:00 +01:00
ynot01
b3c4f8054e Hypospray revamp (Vendor & Upgrades) (#15024)
* hyposprays but good

* upgrade applies to hypo not the modkit itself

* del the modkit

* del modkit 2

* add hypo panel

* typepath typo

* add sound to installing upgrade

* moves stuff out of the way of hypo vend in yog/meta

* readds hypo to box

* poke turdis
2022-08-20 12:32:35 +01:00
Altoids1
c025baf6a7 Reimplements Cinnamon Shakers into the game (#15249)
* Refactors condiments to support yogiments likes cinnamon

The phrasing is a bit awkward but I think this is the best way of implementing this.

Note that, since we're moving away from spammy typelists and going to a singular static, this means that new condiment types with special possible_states will have those states overwritten by initialize_possible_states unless this proc is overwritten for them (as it is for packs). If you're in git blames right now trying to figure out a bug caused by that, that's why.

* Adds cinnamon shakers to food crate & chef vend machine
2022-08-14 18:19:28 +01:00
ynot01
86591ee5c2 patch exploit centocm (#15183) 2022-08-14 17:50:54 +01:00
GraveHat
888ba13474 Concussive Gauntlets Buff and Gibtonite Defusal (#15132)
* gauntletnoboom

better keep up necropolis chest loot

* that's not supposed to be there

you saw nothing...
2022-08-14 17:21:50 +01:00
Redmoogle
9e0b9413ff Ports mothroach from tgstation (#15178)
* MOTHROACH!!

* add meat

* fucking esses

* Update meat.dm

* n o
2022-08-06 16:57:27 -04:00
Bop
194ef23060 Radiant dance machine mark IV can now be ordered from cargo (#15133)
* FUCA

* F

* flo
2022-08-05 14:48:02 +01:00
Redmoogle
5b1a4971d8 Supermatter beacon (#15076) 2022-08-05 14:15:34 +01:00
Bop
2922cf6c4c E (#15070) 2022-08-05 14:10:56 +01:00
GraveHat
87044483e2 Ports necropolis chest loot: Fashionable Clothing from Shiptest (#15089)
* Ports necropolis chest loot: Fashionable clothes from Shiptest

Years have the miners waited for a way to somehow become even more fashionable.

* Clarifies the mood curse

Read the description dammit

* I no learn engrish

spell check and grammar fix
2022-08-04 16:17:56 -04:00