Commit Graph

20762 Commits

Author SHA1 Message Date
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
naut
b6cb421a2c New Drinks n' Cocktails (#17713)
* drinks overhaul

* More drinks

* Bottles and Cartridges

* the log of change

* the impropering

* caffe latte
2023-11-06 21:40:35 +00:00
Matt Atlas
91cff3d0a9 Makes the Shield Capacitor UI into a TGUI. (#17719)
* Makes the Shield Capacitor UI into a TGUI.

* Update code/modules/shieldgen/shield_capacitor.dm

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

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-11-06 16:48:49 +00:00
Cody Brittain
0a9c32c84e Xanu pistol sprite fix (#17724)
* Xanu pistol sprite fix

* CL

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-06 16:48:44 +00:00
Andrew
b4102a6dbd Removes mining access requirement from ore redemption consoles (#17714)
* Removes mining access requirement from ore redemption consoles

The claim points and print yield declarations required mining access to use despite the actual functionality of the console requiring no access. I've removed this access requirement so off-ships with these machines can actually use them.

* Update code/modules/mining/machine_processing.dm

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

* Update code/modules/mining/machine_processing.dm

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-11-06 16:48:28 +00:00
SleepyGemmy
346aadd281 Adds Colourable Shorts (#17691)
* Adds Recolourable Shorts and Short Shorts

* Fixes

* Fix
2023-11-06 16:47:26 +00:00
Pirouette
816e3e5313 Dionae general lore pass (#17684)
* Dionae general lore pass

Accents, backgrounds, and gender

* Create dionapass.yml

* Update background.dm
2023-11-02 11:02:28 +00:00
Geeves
ccc2bd6ce2 Aut'akh Integrated Ethanol Burner Augment (#17643) 2023-11-01 21:39:33 +00:00
lavillastrangiato
452b52dbae Removes Tripping in High Heels (#17699)
* what, like it's hard?

* what, like it's hard?
2023-11-01 18:50:38 +00:00
SleepyGemmy
88a39b4a92 Tweaks Some Skirts' Extended Descriptions (#17690) 2023-11-01 16:14:53 +00:00
Fluffy
fe781404aa sfsadf (#17657) 2023-11-01 16:14:03 +00:00
Fluffy
7f735f7bd6 fps (#17676) 2023-11-01 16:13:56 +00:00
Cody Brittain
b79764e16c Added the Xanan service pistol (#17696)
* Added the Xanan service pistol

* Shrunk the Xanu pistol icon

* Request from loreteam

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-01 16:13:52 +00:00
SleepyGemmy
3359023925 Fixes the Pretzel Recipe (#17710) 2023-11-01 15:12:10 +00:00
RustingWithYou
141b96812a meep you owe me (#17708) 2023-11-01 15:12:07 +00:00
DreamySkrell
9a446c5086 Horizon landmarks consistency && Antag shuttles use generic landmarks (#17700)
* sccv_horizon_shuttle_landmarks.dm

* horizon/nav -> horizon/hangar

* a

* docks ruler helpers

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

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

* /horizon/dock/deck_3/port_3

* sane landmark tags

* merc ship generic dock landmark huh

* fix merc and skipjack area/template_noop

* merc shuttle to use NAV_HORIZON_EXTERIOR_ALL_DECKS

* burglar and raider to use NAV_HORIZON_EXTERIOR_ALL_DECKS and SNEAKY

* NAV_HORIZON_DOCK_ALL

* a

* nav_ert_dock kill

* c

* cc

* ccc

---------

Co-authored-by: DreamySkrell <>
2023-11-01 16:11:06 +01:00
Cody Brittain
4be8285db0 Added a Gadpathurian rebreather, exclusive to Gadpathurians (#17642)
* Added a Gadpathurian rebreather, exclusive to Gadpathurians in the loadout.

* CL

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-27 14:02:43 +00:00
DreamySkrell
ad0fe2cf3a Airlock markers (#17636)
* a

* huhhhh

* freq

* 5

* guidelines

* spawner begone

* c

* cccccccccccccccccc

* myugfkuyfk6uydetkyu

* o

* huhhhhhhhhhhhhhhhhhhhhhhhhh

* Update code/modules/effects/map_effects/airlock_marker.dm

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

* Update code/modules/effects/map_effects/airlock_marker.dm

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

* Update code/modules/effects/map_effects/airlock_marker.dm

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

* Update code/modules/effects/map_effects/airlock_marker.dm

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

* refactor.

* comment

* else if

* oops

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-10-27 07:48:25 +00:00
Matt Atlas
22cf2ae452 Fixes the create command report verb not working. (#17681)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-26 19:53:16 +00:00
Cody Brittain
107e3c1917 Replace all mentions of Gorlex Marauders with Hammertail Smiths (#17644)
* Replace all mentions of Gorlex Marauders with Hammertail Smiths

* CL

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-26 17:41:31 +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
Fluffy
255ebc44ee sdfasdf (#17656) 2023-10-26 17:41:27 +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
Pirouette
ee0ac5af14 Replaced a reference to the singularity with the INDRA in ion laws. (#17679) 2023-10-26 14:19:20 +00:00
smellie
bf032ee4c0 fluke fix and tweak (#17652) 2023-10-26 14:18:59 +00:00
Matt Atlas
57a31355e7 Fixes borers being able to give people Limitless psi rank. (#17659)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-23 21:42:49 +00:00
Cody Brittain
c40d76fa57 Added the Xanan dNAC-6.5 assault rifle (#17613)
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-21 23:11:58 +00:00
Fluffy
be5f0bc04e Integrated electronics dropref (#17641)
* Atomization

* sdf

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-21 18:39:33 +00:00
RustingWithYou
058a3ca223 Konyang: Pirates! (#17591)
* konyang pirate outpost

* moonshine baby

* moonshine

* decals

* clothes!

* mapped-in clothes & changelog

* addresses requested changes

* reverts accidental change
2023-10-21 18:39:15 +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
RustingWithYou
cd603fd15f Adds Orion Express to Service (#17623)
* code for job change & clothing

* sprites

* icon state
2023-10-19 22:47:24 +00:00
Fluffy
206f30c3bc Updated CI to use byond 515.1619 (#17593)
* sadfsda

* 1618

* saffasd

* it never ends
2023-10-19 18:36:26 +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
Geeves
c69513fa3f Thermal Drill Buff (#17437) 2023-10-17 21:05:02 +00:00
Wowzewow (Wezzy)
9ff484c43e Goon Coifs Fix (#17625) 2023-10-17 20:59:26 +00:00
DreamySkrell
208f5d3e2c 1 (#17568)
Co-authored-by: DreamySkrell <>
2023-10-17 20:58:12 +00:00
RustingWithYou
76e966185f Konyang: More Uniforms & Voidsuits (#17585)
* konyang uniforms

* konyang voidsuit

* new voidsuit icons

* changelog

* pachrom & krc uniforms

* changelog & water barge
2023-10-17 20:56:40 +00:00
RustingWithYou
ac8590ad38 Konyang: Village (#17586)
* village code

* changelog

* ghostrole tweak at request

* items

* village -> villager
2023-10-17 20:56:28 +00:00
Fluffy
05f54b1065 Asset immediateload port fix (#17589)
* Atomization

* sdfasfd

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-17 20:56:15 +00:00
Wowzewow (Wezzy)
487fae710e Fixes table deconstruction (#17626)
Fixes #17619
2023-10-17 20:56:00 +00:00
Matt Atlas
f58c6a9eb0 Shrapnel removal now queues up all implants at once. (#17598)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-17 14:51:46 +00:00
Joshie
5f37cc3253 Makes use of the terminal sprites for SM and INDRA engine rooms. (#17592)
* Content

* Edit + Changelog

* Update gyrotron_control.dm

* Weird camera c_tag fixes.

* CI Suite Fix + Atmos Air Injector Fix

* Update furrycactus-chunky-engine-consoles.yml
2023-10-17 14:51:41 +00:00
Geeves
b0b0c498d3 Head Layer / Bodymarkings Fix (#17616) 2023-10-16 19:30:16 +00:00
Wowzewow (Wezzy)
7182934323 Friday the Thirteenth Bugfixes (#17594)
Title
2023-10-16 19:27:31 +00:00
Matt Atlas
fc76a950a8 Adds some slight slowdown to the FR hardsuit. (#17596)
Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-16 19:26:59 +00:00
Tag114
1ffbe26611 Removes PCRC armor vests (#17582)
* Removes PCRC armor vests

* Removes PCRC armor vest sprites

* Changelog
2023-10-15 19:11:33 +00:00
Wowzewow (Wezzy)
a88778e6aa No More Industrial IPC Security (#17403)
* No More Industrial IPC Security

* except warden

* nevermind

* Update code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm

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

* xion as well

* Update security.dm

Co-authored-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* Update wezzy_no_more_industrials.yml

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
Co-authored-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
2023-10-15 15:11:15 +00:00