Commit Graph

8074 Commits

Author SHA1 Message Date
Pirouette
8041bfa1d3 Adds Lunan flag sprites (#17682)
* Adds Lunan flag sprites

* Update accent_tags.dmi

* Update lunanflag.yml
2023-11-13 20:23:52 +00:00
Pirouette
38e137f3c3 Adds new foods, both IRL and lore (#17745)
* tomixfood

* Update recipes_human.dm

* Update recipes_human.dm

* fixes blue raspberry issue

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

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

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-11-13 19:50:09 +00:00
Geeves
2e909aa2b2 Fixes Glass Item Colors (#17766) 2023-11-13 19:46:29 +00:00
CampinKiller24
30383cdefa Buffs Stinger Grenades (#17747)
* p

* real
2023-11-13 19:46:20 +00:00
DreamySkrell
a253fcba9c Airlock markers - docking and shuttle airlocks (#17717)
* rearrange files

* Squashed commit of the following:

commit ec32b5b6e9
Author: DreamySkrell <>
Date:   Sat Oct 28 22:32:05 2023 +0200

    ccc

commit be750e672d
Author: DreamySkrell <>
Date:   Sat Oct 28 22:01:02 2023 +0200

    cc

commit 1ecd9afb6c
Author: DreamySkrell <>
Date:   Sat Oct 28 21:57:38 2023 +0200

    c

commit 159d1000d9
Author: DreamySkrell <>
Date:   Sat Oct 28 21:40:40 2023 +0200

    nav_ert_dock kill

commit b767a2574a
Author: DreamySkrell <>
Date:   Sat Oct 28 21:24:34 2023 +0200

    a

commit aa01eec1fc
Author: DreamySkrell <>
Date:   Sat Oct 28 21:09:48 2023 +0200

    NAV_HORIZON_DOCK_ALL

commit 4564bfd29f
Author: DreamySkrell <>
Date:   Sat Oct 28 20:55:45 2023 +0200

    burglar and raider to use NAV_HORIZON_EXTERIOR_ALL_DECKS and SNEAKY

commit ec7564fcb1
Author: DreamySkrell <>
Date:   Sat Oct 28 20:43:17 2023 +0200

    merc shuttle to use NAV_HORIZON_EXTERIOR_ALL_DECKS

commit d306934a73
Author: DreamySkrell <>
Date:   Fri Oct 27 00:00:41 2023 +0200

    fix merc and skipjack area/template_noop

commit 0600a348cd
Author: DreamySkrell <>
Date:   Thu Oct 26 22:28:45 2023 +0200

    merc ship generic dock landmark huh

commit c9850622f9
Author: DreamySkrell <>
Date:   Thu Oct 26 20:37:55 2023 +0200

    sane landmark tags

commit 56d9052270
Author: DreamySkrell <>
Date:   Thu Oct 26 20:11:55 2023 +0200

    /horizon/dock/deck_3/port_3

commit 846d737c94
Author: DreamySkrell <>
Date:   Thu Oct 26 20:03:17 2023 +0200

    landmark/horizon/deck -> landmark/horizon/exterior/deck

commit ef5c3d1b09
Author: DreamySkrell <>
Date:   Thu Oct 26 20:02:17 2023 +0200

    landmark/horizon/dock -> landmark/horizon/dock/deck_3/...

commit 1716ef26a8
Author: DreamySkrell <>
Date:   Thu Oct 26 19:54:21 2023 +0200

    docks ruler helpers

commit 18c66a3124
Author: DreamySkrell <>
Date:   Thu Oct 26 19:47:27 2023 +0200

    a

commit 0f2fc4524c
Author: DreamySkrell <>
Date:   Thu Oct 26 19:43:19 2023 +0200

    horizon/nav -> horizon/hangar

commit e13a5233d1
Author: DreamySkrell <>
Date:   Thu Oct 26 19:41:08 2023 +0200

    sccv_horizon_shuttle_landmarks.dm

* Squashed commit of the following:

commit 4d7052be3b
Author: DreamySkrell <>
Date:   Sun Oct 29 14:18:40 2023 +0100

    tests rerun please

commit ae04980347
Author: DreamySkrell <>
Date:   Sun Oct 29 13:25:26 2023 +0100

    oops

commit 176ea80155
Author: DreamySkrell <>
Date:   Sun Oct 29 12:54:25 2023 +0100

    tests rerun please

commit 5cf7db9162
Author: DreamySkrell <>
Date:   Sun Oct 29 12:45:07 2023 +0100

    c

commit f93887a1ef
Author: DreamySkrell <>
Date:   Sun Oct 29 12:43:47 2023 +0100

    jjjjjjjjjjjj

commit 697542a270
Author: DreamySkrell <>
Date:   Sun Oct 29 12:25:32 2023 +0100

    a

commit a83373a62a
Author: DreamySkrell <>
Date:   Sun Oct 29 12:17:47 2023 +0100

    ay

commit baf447a694
Author: DreamySkrell <>
Date:   Sun Oct 29 11:05:38 2023 +0100

    a

* sprites

* code and mapping wip...

* huhhhh

* agony

* docs idk

* intrepid idk

* almost working...

* i fucking love docks

* 568

* m

* kkkkkkkkkkkkkkk

* helper in own file

* a

* tags

* huh

* a

* 1 pixel

* intrepid mf

* spark mf

* access

* guidelines

* g

* gd

* hnyfgjdtjtsdyjdtyj

* m

* c

* a

* fix canary and ert shuttle docking controller tags

* huhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh

* remove old changelogs

* sprite

* bad docs removal

---------

Co-authored-by: DreamySkrell <>
2023-11-07 11:04:01 +00:00
SleepyGemmy
ac84b467a2 Holodeck Nullrod Fix (#17692) 2023-11-01 16:14:21 +00:00
Fluffy
fe781404aa sfsadf (#17657) 2023-11-01 16:14:03 +00:00
Matt Atlas
37e489cb96 Revert "Changes + Changelog (#17653)" (#17689)
This reverts commit e0272bbf54.
2023-10-27 16:46:44 +00:00
Fluffy
736922d4cd Modular computers QDEL and refdrops (#17655)
* Atomization

* sdfasdf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-26 17:41:29 +00:00
Geeves
73b6c1ee0d Patient Monitoring Console Overhaul (#17633)
* Patient Monitoring Console Overhaul

* cl

* i like em big

* ooga

* im doing stuff
2023-10-26 14:20:31 +00:00
Tag114
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
Joshie
e0272bbf54 Changes + Changelog (#17653) 2023-10-26 14:19:04 +00:00
Wowzewow (Wezzy)
8332ab1343 21/10/23 Bugfixes (#17648) 2023-10-22 12:36:19 +00:00
Andrew
21f871906b Fixes blood volume reading for health analyzers (#17637)
Blood volume switch uses get_blood_volume() instead of get_blood_oxygenation().
2023-10-21 18:00:00 +00:00
Cody Brittain
2d40e893e0 Assorted oracle fixes (#17645)
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-21 11:32:27 +00:00
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