Commit Graph

8059 Commits

Author SHA1 Message Date
Cody Brittain
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
Cody Brittain
5584baa019 Added a flag and banner for the All-Xanu Republic (#17609)
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-19 18:36:08 +00:00
Geeves
ebf0f3458f Mecha Gamemode: Jockeys (#17148) 2023-10-18 16:49:44 +02:00
Fluffy
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
Wowzewow (Wezzy)
9ff484c43e Goon Coifs Fix (#17625) 2023-10-17 20:59:26 +00:00
Wowzewow (Wezzy)
7182934323 Friday the Thirteenth Bugfixes (#17594)
Title
2023-10-16 19:27:31 +00:00
Matt Atlas
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
Tag114
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
Pirouette
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
Fluffy
3f65f0625e woopsie daisy (#17584) 2023-10-13 08:01:04 +00:00
Wowzewow (Wezzy)
86084d490e 3/4 Update : Chair and Table Loose ends and fixes (#17571)
* 3/4 Update : Chair and Table Loose ends and fixes

* black carpet affair

* damn you golden deep

* Update code/modules/tables/flipping.dm

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

* Update code/modules/tables/flipping.dm

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

* yes

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-10-12 21:36:42 +00:00
Fluffy
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)
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
Geeves
82e9bc1042 Mech Access Fix (#17549) 2023-10-11 21:14:33 +00:00
Matt Atlas
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
Fluffy
741c0b65e0 Flags fix overlooked addition (#17559)
* Atomization

* asfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-10 12:13:28 +00:00
Sparky
d8e993aee0 Adds an Expeditionary Channel and Intercoms & Gives the Interrogation Channel a Name (#17296)
* Expedition Comms

* mistyped

* Adds hailing to expedition intercomms

* Colour Change

* Forgot light mode

* ui fix
2023-10-08 21:34:32 +00:00
Fluffy
139624aa25 Flags fix and minor refactor (#17543)
* Atomization

* afsd

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-08 21:32:50 +00:00
Wowzewow (Wezzy)
ea1101ec5c Better Bodyscanners and Surgery Stuff (#17520)
* Better Bodyscanners and Surgery Stuff

* ope

* i can't believe that worked

* adv

* bodyscanner fixes
2023-10-07 21:36:13 +00:00
DreamySkrell
e381a5fa88 Uplink tgui (#17336)
* add uplink.tsx

* a

* a

* a

* a

* a

* exploitables

* close gui

* a

* delete uplink.tmpl

* 1

* ooooooooooooooooooooooooo

* lint

* c

---------

Co-authored-by: DreamySkrell <>
2023-10-06 22:15:38 +00:00
Geeves
3dc474739d Drill Dropper Shortwave (#17442) 2023-10-06 20:59:57 +00:00
Cody Brittain
6fc69c56c2 Added old and antique Biesel flags (#17170)
* Added old and antique Biesel flags

Update lore desc to make clear, that displaying something that is a direct threat to the SCC is a -very- bad move.

* Add the antique flag to the loadout

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-06 09:23:07 +00:00
CampinKiller24
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
Fluffy
4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
DreamySkrell
28c6a5a1fb Konyang: Point Verdant Sake Brewery (#17502)
* g

* m

* 8

* 9

* 0

* Update code/game/objects/random/food.dm

Co-authored-by: Alberyk <Alberyk@users.noreply.github.com>

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: Alberyk <Alberyk@users.noreply.github.com>
2023-10-05 10:13:52 +00:00
Geeves
987fc9afd6 Kinetic Accelerator Kit (#17496) 2023-10-04 20:28:04 +00:00
Cody Brittain
39639e95d7 Added NanoTrasen Corporation gear to the uplink for antagonist usage. (#17153)
* Added NanoTrasen Corporation gear for antagonist usage.

Correct description of hardsuit armor value

* Fix Indents

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-02 12:39:12 +00:00
Greenjoe12345
f9a03de4a0 Chips Expansion (#17343)
* TAKE 3

* newline
2023-10-01 14:45:56 +00:00
Matt Atlas
baeb7c6afd Updates subsystem definitions to new standards. (#17470)
* My heart is dragging me down into...

...oblivion!

* drifting closer to the edge but she won't have me

* ever round me we are dead before we meet her

* for the last time

* wake up in sweat

* n

* fff

* uff

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-01 14:24:40 +00:00
Wowzewow (Wezzy)
9c69a6e884 Sprite and Bug Fixes Again Again (#17477)
* Sprite and Bug Fixes Again Again

Fixes #17465
Fixes #17462
Fixes #17456
Fixes #17450
Fixes #17458
Fixes #17422

* changelog
2023-09-29 14:01:43 +00:00
Geeves
149f6205c0 Mining Coin Tweak (#17441) 2023-09-28 19:38:14 +00:00
DreamySkrell
33cb2b433e Abandoned Industrial Station: post-3/4 fixes (#17331)
* mapping

* floor_damage defs

* random_broken

* floor damage

* mapping

* changelog

---------

Co-authored-by: DreamySkrell <>
2023-09-27 13:36:28 +00:00
Cody Brittain
0a3dac31e0 Refactored do_after to use a flag-based system for options (#17127)
* Refactored do_after to use a flag-based system for options

* More flags

* Ditto

* Use the HAS_FLAG macro

* do_after pass

* Fix burning paper code

* Resolve issues from Fluffy's code reviews

* .
2023-09-27 12:17:14 +00:00
Greenjoe12345
5bccb6ab3e Glass sliding doors for urban maps (#17448)
* doors

* adjustments and fix
2023-09-27 10:26:51 +00:00
Fluffy
870f97c1c7 Icon smoothing subsystem update (#17383)
* sfasdf

* sfsaf

* sadfas

* sdfasdf
2023-09-27 10:23:15 +00:00
Wowzewow (Wezzy)
fd26ff32e2 Fixes Examine Crashes (#17430)
* Fixes Examine Crashes

* fukken indentations
2023-09-27 10:22:04 +00:00
RustingWithYou
0c5ea41216 Hivenet Electronic Warfare + Black K'ois Tweaks (#17234)
* hivenet emergency transmission

* no phoron + harder to remove

* a fuckton of stuff

* hive verbs

* hive admin verbs

* admin verbs again

* encrypt

* mute

* Camera Access, Neural Shock & More

* electronic warfare

* changelog

* changelog 2

* more changelog updates

* Update code/game/objects/items/devices/traitordevices.dm

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

* Update html/changelogs/RustingWithYou - willofthequeens.yml

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

* test failures begone

* ok, now test failures begone

* addresses requested changes

* more requested changes

* missing span classes

* fullshield

* traits!

* addresses requested changes

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/organs/subtypes/vaurca.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Update code/modules/admin/topic.dm

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

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

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

* Update code/modules/organs/subtypes/vaurca.dm

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

* hivenet checks to proc, admin socket to var

* Update code/modules/organs/subtypes/vaurca.dm

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

* Update code/modules/organs/subtypes/vaurca.dm

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

* parasite.dm span fixes

* spacing

* purge a couple unnecessary returns

* fuck your spaces

* dominia is right bots should be destroyed

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-27 09:19:00 +00:00
Geeves
2c46ef8a4d Examinable Armor (#17364)
* Examinable Armor

* horse react this linter

* me coder

* changes

* Update tgui/packages/tgui/interfaces/ArmorValues.tsx

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

* capitalize

* cl newline

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-09-26 19:12:00 +00:00
Fluffy
173f73ae27 sfas (#17446) 2023-09-26 18:15:27 +00:00
Cody Brittain
0db705d678 Implant Improvements (#16905)
* Modernize and improve implant code

* Lint fix

* Fix initialize hint in implant cases

* fix tabulations

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-24 22:41:02 +00:00
Wowzewow (Wezzy)
086776cb83 New Cell Charger, Suit Storage, Drying Rack and Smartfridge Sprites (#17390)
* New Cell Charger, Suit Storage and Smartfridge Sprites

title, ported from /tg/

* Update wezzy-RandomBetterSprats.yml

* oops

* merge conflict

* konyang shit
2023-09-24 22:14:10 +00:00
Wowzewow (Wezzy)
faca6da739 The Food Sortening, Extra Pain-In-My-Ass Edition (#17393)
* The Food Sortening, Extra Pain-In-My-Ass Edition

Sorts all food sprites and cuts down the MONOLITH snacks.dm and food.dmi. This was an absolute pain in my ass. No front-facing changes.

Planning to add more shit down the line. Makes everyone's lives easier.

* changelol

* finally

* inhands

* merge conflict

* this really "ticked" me off HAHAHAHAHS

* fixes

* make megalinter happy
2023-09-24 22:13:15 +00:00
Fluffy
9d2f950e8e Fixed ZASDBG, Added ZAS logging subsystem, Removed FIREDBG and consolidated it under ZASDBG (#17386)
* Atomization

* asfsa

* sdaf

* sdfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-09-23 19:25:13 +00:00
kyres1
f18d4128ad [WORK IN PROGRESS] Konyang and Point Verdant (#16714)
* starting point verdant

* major progress

* PAIN

* test

* zlevels AAGHHH OH NO

* im scream

* kawnyang

* dam thats good

* Biff Largehuge

* Look Gordon, ropes!

* wawagh

* rgrhgrhrgrh

* Gordon, you're alive! Thank God for that hazard suit.

* help

* frownie face

* wegh

* Gordon! Get away from the beams!

* Good morning, Gordon.

* Signs

* fix multiple proc definition

* initial ambience

* gay rain

* beach and some pebbles literally

* fixing conflicts aUGH

* generation

* guh?

* sewers and beach additions

* maping

* map

* womp womp

* landing zone

* fixing missing shit

* buddha

* ass

* major map updates

* implemented key doors, fixed baloon alert and tasks

* mineral color, adds ozone layer

* real fake walls

* vending subtypes for the regional market

* mooooar

* minimart pt 1

* haneunim skybox

* station mapping progress

* minimart and roboclinic

* offices progress

* bar work

* size change, some polishing of the office + police station

* map size update. Also a fuckton

* tunnels

* more work

* Why doesnt the map initialize

* broke shit

* fixing point verdant spawning, also ocean landing zone

* finishing some buildings

* mapping, village, not finished

* village, main road

* village stuff

* village stuff

* village stuff

* village stuff

* anchoring

* village stuff

* random space tiles fix

* random space tiles fix

* bin fixes

* missing initialize hint on new floors

* fix open space on basement level

* idk

* missing initialize hint

* tests again please

* tests rerun please

* oven/small be gone

* remove shuttle landmarks idk

* bad stairs fix maybe

* fix missing open space above stairs

* tests rerun please

* CircularRandomTurfAround fix

* spaces to tabs

---------

Co-authored-by: atteria <tarkona@protonmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
2023-09-23 21:23:38 +02:00
Fluffy
955102ef4d More spacemandmm harnessing against bad code (#17376)
* sdfaf

* ssdasd

* dfsd

* try to apply a linter to spot violations of editorconfig

* sfdas

* asf

* sadfas

* sfasf

* asfsda

* sdaf

* sfsad

* totally not for testing

* aaaaaaaaaaaaaaa

* asfsadf

* saf

* sdfaf
2023-09-23 13:46:26 +00:00
Wowzewow (Wezzy)
186e3a9547 Assorted Bug Fixes (#17399) 2023-09-22 20:10:02 +00:00
Alberyk
a6db489e71 Tajara religious loadout fixes (#17395)
* Loadout fixes

* changelog
2023-09-22 11:01:49 +00:00
Alberyk
57ad3201e0 Tajara loadout expansion: far from home edition (#17270)
* A lot of tajaran stuff

* Changelog

* moved this for better organization

* god fix

* Update code/modules/clothing/rings/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Flame source

* imrpoper

* passport

* matt fixes

* Fixes conflict

* fixes

* kitchen

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-21 10:28:15 +00:00
Wowzewow (Wezzy)
1b51600ca6 Kitchen Resprites (#17311)
* Kitchen Resprites

* for ata

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* admiral ackbar cereal

* walter j hartwell

* for real?

* hank schrader

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-19 09:58:22 +00:00
Wowzewow (Wezzy)
a831982d22 Cigarettes Glitch Fix (#17361)
Fixes #17280
2023-09-18 20:38:15 +00:00