3600 Commits
Author SHA1 Message Date
FluffyandGitHub 849340274d sdaf (#18321) 2024-02-08 12:38:28 +00:00
FluffyandGitHub 25dc248979 Updated statpanel and added client pings (#18337)
* SSatlas.current_map

* hardsuit spell tab appears to clear correctly

* sdfsa

* from the moment i understood the weakness of my flesh, it disgusted me

* sdf
2024-02-08 12:29:42 +00:00
DreamySkrellGitHubDreamySkrell <>
4fbd03bcd6 Private yacht (#18211)
* hmmm

* 8

* 56789

* 9

* a

* :)

* k

* o

* a

* 768

* h

* 5

* j

* h

* 4

* 12

* 9r

* gg

* qqqqqq

* hmm

* 8

* r

* ddddd

* 6

* tryjsrtjs45rujhrtfd

* trfjtrdxjs456 uya45 rst hrstyj

* o

* idk

* l

* a

* e

* 315

* cc

* q

---------

Co-authored-by: DreamySkrell <>
2024-02-05 20:23:16 +00:00
FluffyandGitHub 1da2f6e7b8 Added a ruins UT (#18290)
* sdfa

* fas

* the godness guides, the godness protects

* sadf

* sdf

* fsa

* exoplanets_ruins config for UT

* sdaf

* sdf

* curse upon me
2024-01-30 11:00:23 +00:00
FluffyandGitHub 62cadc6c29 sf (#18282) 2024-01-30 10:54:48 +00:00
b19b563352 Flashbang nerfs, grenade priming animation. (#18251)
* Flashbang nerfs, grenade priming animation.

* ffs

* generalize explosions in hand

* sdads

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-23 10:53:17 +00:00
FluffyandGitHub cc74d7dcc8 Updated spatial gridmap (#18244)
* sadf

* jhbkhbh

* hope

* gsda
2024-01-21 23:29:42 +00:00
feartheblackoutandGitHub 0b6db78361 Fixes Vaurca tunnel cloak pixel block (#18263) 2024-01-20 14:50:39 +00:00
GeevesandGitHub 0989a55e3a Cigarette Packet Offering Fix (#18264) 2024-01-20 14:50:27 +00:00
651bf48854 Bugfix pack #1. (#18221)
* Bugfix pack #1.

* oops

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-16 18:56:01 +00:00
FluffyandGitHub ca6b04e1d7 Updated SSgarbage (#18173)
* pain

* sadfas

* sdfa

* sdfasf

* sfa

* sdf

* might the lord have mercy on our soul

* i cri everidai

* adeste fideles

* sdf

* where will this lead, what's coming next, from your inventions

* dear lord

* gjvhk

* i cri everidai

* fsgf

* sdfa

* sdaf

* hiuhi
2024-01-15 14:08:27 +00:00
AlaunusLuxandGitHub 0c8bdbdd68 Fixes napalm grenades failing to detonate if still held after their timer expires, fixes description of Napalm in uplink, and reduces cost by three (#18201)
* Fixes napalm grenades failing to detonate if still held after their timer. Puts five grenades in the box, to match the uplink description

* changelog

* changelog author

* Three napalm grenades, five credits
2024-01-15 14:05:15 +00:00
0f70609936 Adds Konyanger tea leaves, teapots, and tea cups. (#18145)
* Adds Konyanger tea leaves, teapots, and tea cups.

* teatray to the glassware

* classic

* teapot correction

* updates

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-01-07 23:45:59 +00:00
RamkeandGitHub d7c992da39 Geiger counters can now be stored in toolbelts (#18118)
* geiger + belt = geigerbelt

* whoop
2024-01-04 16:53:01 +00:00
RamkeandGitHub 5d314a0fcd I'm so hungry (#18093)
* delicious food

* cl

* removes fullness var
2024-01-01 15:31:10 +00:00
GeevesandGitHub 57c04c2815 Antagonist Banks (#18005) 2023-12-31 18:03:30 +00:00
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
FluffyandGitHub 51a96cb43e sfad (#18021) 2023-12-24 11:18:41 +00:00
GötzandGitHub 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
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
RustingWithYouandGitHub cec7b88ffc tcfl -> tcaf (#17957) 2023-12-17 15:25:23 +00:00
lavillastrangiatoandGitHub 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
FluffyandGitHub e27a6f3070 Hail Lii'dra (#17925)
* fsad

* uihj
2023-12-13 19:06:40 +00:00
FluffyandGitHub b128829a78 sdaf (#17934) 2023-12-13 19:03:58 +00:00
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
FluffyandGitHub d8d063edc6 EMP Refactor & Multi Z-level EMPs (#17781)
* sdfasf

* sdfas

* dsf
2023-12-04 19:37:49 +00:00
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
GeevesandGitHub 8db403e4eb Void Identification Stuff (#17773)
* Void Identification Stuff

* add to crew armory
2023-11-27 00:49:38 +00:00
06601c9ec3 Split up and rename var/flags (#17794)
* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-22 16:27:51 +00:00
GeevesandGitHub 2e909aa2b2 Fixes Glass Item Colors (#17766) 2023-11-13 19:46:29 +00:00
CampinKiller24andGitHub 30383cdefa Buffs Stinger Grenades (#17747)
* p

* real
2023-11-13 19:46:20 +00:00
SleepyGemmyandGitHub ac84b467a2 Holodeck Nullrod Fix (#17692) 2023-11-01 16:14:21 +00:00
FluffyandGitHub fe781404aa sfsadf (#17657) 2023-11-01 16:14:03 +00:00
FluffyGitHubFluffyGhost <FluffyGhost>
736922d4cd Modular computers QDEL and refdrops (#17655)
* Atomization

* sdfasdf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-26 17:41:29 +00:00
Tag114andGitHub 0975553bb2 Removes various mentions of the Syndicate, labels "Nutri-Cakes" as an improper name (#17629)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Changelog

* Add files via upload

* Changelog edit

* Changelog edit

* changelog edit

* Changes supply console names for red space suit and helmet

* Changes stealth armory dropper name to "Tactical Autodrone"

* Makes trash nutri-cakes improper

* Makes food Nutri-Cakes improper

* Changelog update

* Add files via upload

* Add files via upload
2023-10-26 14:19:30 +00:00
2d40e893e0 Assorted oracle fixes (#17645)
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-21 11:32:27 +00:00
4e2b58f02a Added new drugs from lore and otherwise (#16773)
* Initial commit of new drugs

Start on caromeg and oracle

Further work on caromeg

Fix nicotine and caromeg

Begin populating map

Designer cocaine effects

Weaken heroin, Joy now causes genetic damage

Added an artificial alternative to morphine, tramarine, that can be used in its place.

Nerf new opioids, fix tramaline recipe

Added special mentholated adhomian cigarettes, for NKA cigarettes

General fixes

Fix recipe pathing

Add coca leaves, cocaine recipes, and coca drinks

Update Chemistry-Reagents-Medicine.dm

Null name for abstract drug class

Remove abstract_class from reagents (shouldn't be used there)

* Oracle sprites by Wezzy

* .

* Begin resolving issues from code review

* Remove all per-player data from drug singletons

* Resolve Arrow's code review

* Apply suggestions from code review

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

Update code/modules/hydroponics/seed_datums/smokables.dm

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

* Removed coca plants from the standard garden and hydroponics vendors (they remain as contraband and in the xenobotany garden)

* Fix merge conflict errors caused by snack PR

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-20 17:55:13 +00:00
GeevesandGitHub ebf0f3458f Mecha Gamemode: Jockeys (#17148) 2023-10-18 16:49:44 +02:00
f966e50ce1 Zombies upgrade (#17366)
* step 0

* sdad

* asdfsad

* safsad

* actual sprites for the bull from whitewolftamer

* Apply suggestions from code review

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* Update html/changelogs/fluffyghost-zombieupgrade.yml

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>

* sisyphus

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-10-17 21:05:27 +00:00
9b7138ba05 Medkits can now only hold small-sized items. (#17583)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-13 21:49:50 +00:00
Tag114andGitHub beedad9f68 Punctuation fixes for the descriptions for Syndicate boxes, the Romanovich Cloud and several trench coats (#17580)
* Adds missing full stop to sleek trench coat descriptions

* Fixes missing space between words in Romanovich Cloud sector description

* Adds missing full stop to syndiebox description

* Changelog

* Changelog edit

* Changelog edit
2023-10-13 19:08:28 +00:00
PirouetteandGitHub 2880d7098b Ported surgery sounds from /vg/station (#17531)
* Ported surgery sounds from /vg/station

Source: https://github.com/vgstation-coders/vgstation13/pull/31850

* Requested changes

* accidentally a line

* Moves cautery sound
2023-10-13 08:01:21 +00:00
FluffyGitHubFluffyGhost <FluffyGhost>
8bb0ecfcd3 Icon smoothing and icon update refactor (#17569)
* Atomization

* asdfsadf

* sdfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-12 21:23:28 +00:00
Wowzewow (Wezzy)andGitHub 9b9392801c tweaks mindshield text (#17528)
* tweaks mindshield text

should be in line with the old loyalty implant now

* Update mindshield.dm
2023-10-12 14:37:22 +00:00
GeevesandGitHub 82e9bc1042 Mech Access Fix (#17549) 2023-10-11 21:14:33 +00:00
54dc8a0860 Adds TGUI say and TGUI input. (#17471)
* i alone am the honoured one

* THROUGHOUT HEAVEN AND EARTH I ALONE AM THE HONOURED ONE

* hollow point

* nanana

* ssss

* tgsay final touches

* stuff

* tgui inputs

* help

* carpal tunnel syndrome

* ffff

* again and again and again and again

* hehehehe

* dsada

* readd sanitize

* whoops

* dsad

* nah fuck that

* sd

* fix

* ow

* remove prefs for testmerging

* oops

* oops 2

* fix that

* f

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-11 23:26:59 +02:00
CampinKiller24andGitHub cea8ca8d9a Adds Stinger Grenades (#17474)
* balls

* lint this

* lint deez

* le change

* Update stinger.dm

* i am going to murder the new linter

* sprite

* Update CampinKiller24-ready-or-not.yml
2023-10-05 10:16:21 +00:00
FluffyandGitHub 4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
GeevesandGitHub 987fc9afd6 Kinetic Accelerator Kit (#17496) 2023-10-04 20:28:04 +00:00
Greenjoe12345andGitHub f9a03de4a0 Chips Expansion (#17343)
* TAKE 3

* newline
2023-10-01 14:45:56 +00:00