Commit Graph

8126 Commits

Author SHA1 Message Date
lavillastrangiato
088d10175b Adds a k'ois freezer subtype and places it in the kitchen (#18087)
* b

* saltprfortol

* Revert "saltprfortol"

This reverts commit 09e8f77f65.

* freezer subtype

* all the rest

* geeves' fixes
2023-12-31 18:06:05 +00:00
Geeves
57c04c2815 Antagonist Banks (#18005) 2023-12-31 18:03:30 +00:00
Geeves
35d60d0886 Warrant Fix & More (#18085)
* Warrant Fix & More

* the nuclear option

* i hate the dme!

* fluffy review
2023-12-31 18:00:27 +00:00
RustingWithYou
c3e3c54f01 yeah (#18061) 2023-12-28 16:22:49 +00:00
tomixcomics
fec20152b8 New lore foods, Milkshakes, and a bugfix. (#18048)
* New foods, milkshakes, and a bugfix.

* changed syrup colors

* resolved weird merge conflict

* Update code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* made requested changes

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/Chemistry-Recipes.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/cooking/recipes/cultural/recipes_human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/human.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* made requested changes

* more corrections

* updating again because it didn't take last time

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-12-27 16:40:09 +00:00
Matt Atlas
bde9a3a353 Fixes blood oxy display for health scanners. (#18072)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-27 11:39:12 +00:00
RustingWithYou
c07340bcf5 Energy Weapon Recharging: The Future Is Now (#17969)
* charge stuff

backpack charging

adds to antag uplink & ert suits

* modules for breachers & backpacks for lizards

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

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* requested changes

* hghghuh

* Update code/game/objects/items/recharger_backpack.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* variable tweaking

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

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/game/objects/items/recharger_backpack.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/spacesuits/rig/modules/utility.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/spacesuits/rig/modules/utility.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/spacesuits/rig/modules/utility.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/spacesuits/rig/modules/utility.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* recharger for new suits

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Alberyk <Alberyk@users.noreply.github.com>
2023-12-26 02:31:25 +00:00
Matt Atlas
cadd19beac Ports the TG globals controller and converts globals. (#18057)
* SDQL2 update

* fix that verb

* cl

* fix that

* toworld

* this is pointless

* update info

* siiiiick..

* vv edit update

* fix that

* fix editing vars

* fix VV

* Port the /TG/ globals controller.

* part 1

* part 2

* oops

* part 3

* Hollow Purple

* sadas

* bsbsdb

* muda na agaki ta

* ids 1-15

* 16-31

* 41-75

* bring me back to how things used to be before i lost it all

* the strength of mayhem

* final touches

* cl

* protect some vars

* update sdql2 to use glob

* stuff?

* forgot that is not defined there

* whoops

* observ

* but it never gets better

* a

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-26 01:16:02 +00:00
Fluffy
a02be9f1fd Updated SSAtoms to TG's version (#18032)
* emperor protects

* sdfas

* sadf

* sdf
2023-12-25 20:38:08 +00:00
Matt Atlas
12487c94bb Updates SDQL2 to the latest TG version and adds variable protection. (#17997)
* SDQL2 update

* fix that verb

* cl

* fix that

* toworld

* this is pointless

* update info

* siiiiick..

* vv edit update

* fix that

* fix editing vars

* fix VV

* discord protection

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-25 17:10:35 +00:00
Matt Atlas
4629903dd2 Adds Dominian Imperial Army gear. (#17971)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-25 16:19:40 +00:00
RustingWithYou
8e6b4cc633 More Ninja Hardsuits & Gear Crates (#18020)
* ninja hardsuits

but here's the warbler

balance tweaks to bug armor

yeah??? fucker.

we're so back we're so back we're so

and icons

changelog and syntax fixes

guh

* oops

* rig nerf
2023-12-24 23:31:31 +00:00
Fluffy
51a96cb43e sfad (#18021) 2023-12-24 11:18:41 +00:00
smellie
6e48c109c2 Icon Fix For Crayons and Drafting Chalk (#18045)
* crayon-icons-fix

Changes the icon var for drafting chalk and crayons.

* changelog
2023-12-22 21:25:48 +00:00
Joshie
88e4aeb91f Fix and Changelog (#18042) 2023-12-22 21:24:37 +00:00
Götz
c0ad451e68 Ma'Ta'Ke Priest Item and Banner Fix (#17982)
This adds a missing line of code for Shumaila's Hammer and a typo in flags.dmi for Dhrarmela's Banner, both of which caused neither item to have sprites.

Now, Tajara can easily outdwarf Himeans.
2023-12-21 11:41:10 +00:00
Matt Atlas
23c0fd7b4f Autolathe and wires panel TGUI, autolathe queueing. (#17978)
* autolathe 1

* FUCK MY LIFE

* more fixes

* autolathe queueing

* cl

* garbage collection

* wire fixes

* some final tweaks

* on second thought this might be annoying

* fix that

* whoopsies

* that didn't work for shit

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-12-21 11:40:49 +00:00
Werner
3daec39efa Changes the discord bot into a subsystem and adds quite a bit of additional logging (#17996)
* Changes the discord bot into a subsystem and adds quite a bit of additional logging

* Removes a forgotten todo

* replaces call with RUSTG_CALL (to make it compile) and adds a comment

* Re-Add log prefix

---------

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
2023-12-19 22:54:57 +00:00
shaky-jake
0dc9ab5cca Unified Sadar Fleet Ship (#17970)
* tis time for nefarious deeds

* all it takes is one lattice

* francisca directions and minor tweaks

* scarab origin ooc note

* lint pls

---------

Co-authored-by: ShakyJake <jakeisnowshaken@gmail.com>
2023-12-19 20:43:29 +00:00
Geeves
d7db1f6d4a Orion Express Courier System (#17952)
* Orion Express Courier System

* tweaks and fixes

* whoops this goes in the back

* cement das conk creet baybee

* while funny, fixed supplies count

* add support for non-overmap tests

* guh

* anotha one

* feedback

* remove unused imports
2023-12-19 11:45:39 +00:00
Geeves
0ad0f77b1a TGUI Armor Examine Fix (#17986) 2023-12-18 16:01:51 +00:00
DreamySkrell
ae3bf5f331 SCC Scout Ship (#17826)
* scout ship stuff

* stuff

* work

* xyz

* all roles

* things

* mappin

* things

* Revert "things"

This reverts commit ca4006f1c8.

* thingz

* ay

* xyz

* spawner

* a

* H

* holy hell

* huh

* m

* 6

* a

* o

* 9

* 8

* o

* o

* xd

* 5

* 2

* 999

* areas

* 7

* a

* 134

* 12

* o

* random.dmi

* 87

* a

* s

* u

* 5

* 7

* 6547

* ,

* 2534

* ghostspawner

* 2

* 5

* 6

---------

Co-authored-by: DreamySkrell <>
2023-12-18 12:27:09 +00:00
RustingWithYou
bc66a212d7 Hephaestus Security Ship & Corporate Voidsuit Tweaks (#17962)
* hephaestus security ship

* fuck off

* welcome mesgaes

* lattice hell

* damn you kaizr

* cabinet
2023-12-18 11:36:32 +00:00
Sparky
1fdf2c750c Hammertail Gear (#17960)
* Hammertail Gear

Adds a Hammertail Smiths jumsuit, as well as adding themed gear crates to the uplink.

* Fix?

* Fix again

* Forgot to rename uplink

* Missing space

* Group Gear Looped

As requested
2023-12-17 21:44:52 +00:00
RustingWithYou
cec7b88ffc tcfl -> tcaf (#17957) 2023-12-17 15:25:23 +00:00
RustingWithYou
bbe473de83 Scarab Salvage Ship (#17857)
* map

* byeah

* i fucking love scarabs bro i fucking hate gravity

* decals

* cl

* ship fluff

* L

* flags

* docks, wider catwalks

* airlocks

* sectors

* bedroom & armory swap

* ghuh

* entry points

* flag

* ghuh

* hguh

* more claustrophobia, more gaming

* alarme

* love me doors

* a single fucking lattice

* fleg

* great grate mate

* uhhhh

* aaaa

* fixes & changes

* sschpasche

* h
2023-12-15 17:08:54 +00:00
lavillastrangiato
c0b2b24e42 Nerfs Punji Trap Damage and Fertilizer Injection (#17936)
* b

* salt pr for tol

* them changes(logs)

* json setting fix

* a quick edit
2023-12-15 08:39:48 +00:00
Fluffy
e27a6f3070 Hail Lii'dra (#17925)
* fsad

* uihj
2023-12-13 19:06:40 +00:00
Fluffy
b128829a78 sdaf (#17934) 2023-12-13 19:03:58 +00:00
Fluffy
22a6057a2e sfas (#17938) 2023-12-13 19:03:06 +00:00
Fluffy
4f94c7678c Fixed floors and carpets building (#17941)
* sdfa

* sdf
2023-12-13 19:03:00 +00:00
Fluffy
123aa0699f sfsa (#17933) 2023-12-12 16:37:40 +00:00
Fluffy
33ed164200 sdfsa (#17916) 2023-12-10 14:51:49 +00:00
Fluffy
df03176859 Aurora: Vietnam Edition (#17859)
* standstill landmine

* more

* fsdfsa

* cl

* sdaf

* Apply suggestions from code review

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* sadsdf

* sdaf

* sdaf

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-12-09 21:28:54 +00:00
Fluffy
bed6bc3d73 Improve scrubbers (#17892)
* sd

* unrelated bug i found

* fafsd
2023-12-09 21:28:52 +00:00
feartheblackout
d009186069 Adds Galatean flags & banners (#17886) 2023-12-09 12:26:42 +00:00
Fluffy
c4f5dc06e7 sdaf (#17910) 2023-12-09 12:26:08 +00:00
Avery Marie
c56041e87e SCC Energy Pistol (#17854)
* First Test

* fixes projectile type

* Gun works!

* blah

* testin

* SCC Energy Pistol

* Tweaks Damage

* Removes the random map change, sorry.

* Removes the turret confusion

* Updates the changelog to be more specific

* Forgot to delete this

* Gun dmi changed

* fixes some code
2023-12-06 18:46:48 +00:00
Wowzewow (Wezzy)
5ad3c00da2 A Reasonable Suit Sensor Rebalance (#17607)
* A Reasonable Suit Sensor Rebalance

* discombobulate

* weird ahh

* HAPPY WHEELS

* SQL

* this will work hopefully

* damn me dumb

* please work

* Apply suggestions from code review

* Rename V004_suit_sensors.sql to V004__suit_sensors.sql

* remove sensor lock

* dmdocs + fixes

* Update code/modules/clothing/under/jobs/civilian.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update SQL/migrate-2023/V004__suit_sensors.sql

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/clothing/clothing.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* changes

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-12-06 18:41:46 +00:00
Cody Brittain
06d04f71ec Gadpathur Navy Patrol Vessel (#17537)
* Start of Gadpathur Navy vessel

More work on the Gadpathur Vessel

Nearly finished now...

* More work on the Gadpathur vessel

* More work on the Vessel

More work on the vessel

More work on the vessel

* attempt to fix runtime errors

* Remove duplicate APCs and fix designation

* Overhauled the cadre surgeon uniform with generic scrub sprites

* Attempt to fix runtime errors, more work on access restrictions

* Fix hallway power and air alarms, fix designation test

* Change the Captain's uniform to be more distinct

* Add breath masks for EVA suits (may be replaced with rebreathers)

* Added Xanan pistol and Gadpathur rebreather

* Fix positioning of the ship guns

* Replace the generic combat shotgun with the Xanan shotgun

* Used code defined gun cabinets

* Set a unit test group(?)

* Fix compile

* Ditto

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-12-05 11:41:51 +00:00
Fluffy
eecb69f8f8 sfa (#17871) 2023-12-05 11:40:11 +00:00
AlaunusLux
00395e1874 Add search to traitor uplink (#17868)
* Add search to traitor uplink

* closing brace

* Remove braces in DM, rename nano to tg, change list instatiation
2023-12-05 11:39:37 +00:00
Fluffy
fa37c9d269 sadfasd (#17876) 2023-12-04 20:52:36 +00:00
Fluffy
d8d063edc6 EMP Refactor & Multi Z-level EMPs (#17781)
* sdfasf

* sdfas

* dsf
2023-12-04 19:37:49 +00:00
CampinKiller24
35e79d4656 Adds the Elyran Flags (#17852)
* flag on the play

* more description here

* Update flags.dmi

fix minor offset oops
2023-12-04 18:15:59 +00:00
tomixcomics
3807930fe6 Adds Several New Foods (#17759)
* broke game while working on update, halp

thanks tech support

* Update code/modules/reagents/reagent_containers/food/snacks/soup.dm

Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>

* Added more foods, still WIP

* updating things to see where the bgus are coming from

triolade, palfooz and cake pops are lal broken and idk why yet ._. someone said is hould commit changes and see what the checks say.

* trying to fix triolade and palfouz

* code giving trouble

* finally fixed the issues! woo!

* Got almost everything done and working!

only pitas are left :)

* Final update!

-Added a whole lot of recipes
-Fixed a whole lot of bugs
-Fixed V'krexi wraps from a previous update
-Updated some icons
-Let's submit this thing!

* Adding changelog

Woo, changelog!

* Update Tomixcomics-PR-17759.yml

Whoops, missed a typo.

* trying to solve issues

* fixed bug that was causing runtime errors when recipes were made incorrectly. PR should be good to go now.

* Update code/game/objects/items/trash.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/cooking/recipes/cultural/recipes_human.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/sandwich.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* small fixes

deleted folder that wasn't supposed to be included (still no clue why it was there lol) and deleted unnecessary annotation

---------

Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-12-01 12:13:46 +00:00
Geeves
b7a73eb364 Antag Cosmetic Surgery Kit (#17770)
* Antag Cosmetic Surgery Kit

* tgui input
2023-11-27 23:21:22 +00:00
Geeves
8db403e4eb Void Identification Stuff (#17773)
* Void Identification Stuff

* add to crew armory
2023-11-27 00:49:38 +00:00
Cody Brittain
9d3b2f50b6 Added support for larger on-mob and item sprites. (#17819)
* Added support for larger on-mob and item sprites.

* DMDoc fixes

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-27 00:47:17 +00:00
Geeves
a7f76adb7f Footprint Offset (#17776) 2023-11-26 08:25:10 +00:00