Commit Graph

8224 Commits

Author SHA1 Message Date
Hockaa
c8b3e2e690 Sets usesound and surgerysound vars when a tool bit is selected (#18707) 2024-03-21 11:41:42 +00:00
Cody Brittain
586715d028 Added more fantasy drugs to the game (#18628)
* Added more drugs

* Added Colorspace

* Fix errors

* Remove ToxLoss from Snowflake overdose. Quarter the power of Colorspace.

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2024-03-19 16:35:47 +00:00
RustingWithYou
00ce2c4229 Chaplain & Vampire Tweaks (#18297)
* hallelujah

* capital w

* bluespace inhibitors & neutralizers block veilwalk

* cl update

* yeah

* owner mob moment

* glare & enthrall tweaks

* Update code/game/gamemodes/vampire/vampire_powers.dm

Co-authored-by: Geeves <ggrobler447@gmail.com>
Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

* geeves oment

* undoes glare nerfs

* sovl removal

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: Geeves <ggrobler447@gmail.com>
2024-03-18 09:16:16 +00:00
DreamySkrell
6b12b09df3 More floors and decals (#18328)
* industrial decals from galatean ship

* aa

* wood

* a

* hbsr4thb

* freezer and white

* floor spritez

* uggghh

* dme

* graegrae

* cccc

* aerhbgran

* hhhghghg

* 4

* g5eah5e

* hhh

* line decals

* 234gf3erg

* s6u 45r

* door marking

* 56s46hb45

* jtfjft

* th

* eg

* g

* 4ewrahbd

* rhb

* #include "interface\skin.dmf" huh????

* soul injection

* cc

* wdfqasc

* b

* ugh

* tests rerun please

* rg

---------

Co-authored-by: DreamySkrell <>
2024-03-17 22:01:35 +00:00
juniper
16f24d9008 Coalition of Snackolonies II: Fetch Harder Edition (#18626)
* ship it joe

* yangechog

* hoargh

* it's a plastic bottle

* little things

* MEAT

* last bit

* vanilla isn't real

* maps in the vendor + minor additions

* this may fix the Issue

* do this later

* last-minute changes i noticed while i was at work

* my agonies

* aeiou

* keep trying...

* what will this break hmm

* i clench my fist and beat it

* matt's changes

* fixes feni + 2275
2024-03-17 21:56:49 +00:00
RustingWithYou
950998d241 Exoplanet Water Mechanics (#18425)
* water moment

* changelog

* hgh

* sewer poison

* get owned lol

* yeah

* init

* g

* huh

* more infectious more infectious

* whitespace

* fixes overlays

* Update code/modules/overmap/exoplanets/decor/turfs/water.dm

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

* grates, wash procs, and requested changes

* DMDocs

* reagent amount check

* Update code/modules/overmap/exoplanets/decor/turfs/water.dm

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

* Update code/modules/overmap/exoplanets/decor/turfs/water.dm

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

* Update code/modules/overmap/exoplanets/decor/turfs/water.dm

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

* requested changes

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-17 21:55:58 +00:00
tomixcomics
fddefa054e Decrease food waste (Kitchens spawn with a few extra ingredients) (#18648)
* first commit

woo

* added changelog

* Update aurorastation.dme

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>

---------

Signed-off-by: tomixcomics <tomi.lifelesslosers@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-17 21:55:12 +00:00
RustingWithYou
2966c1ff09 Ports Baystation's Bluespace Flares (#18619)
* bluespace flares

* belts

* map changes

* log_debug -> stack_trace

* signals
2024-03-13 21:27:48 +00:00
RustingWithYou
c11983086b Trophy of Battle - Secondary Transmitter Drone Core (#18623)
* a trophy of war

* Update code/game/objects/structures/hivebot_head.dm

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

* sleep -> timer

* Stray Newline

Signed-off-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Signed-off-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-13 21:27:43 +00:00
RustingWithYou
8585f89c07 Exclusionist Items (#18416)
* exclusionist gear

* h

* flag
2024-03-11 10:30:33 +00:00
Greenjoe12345
e80f7aab9b schlorrgo plush go ough (#18591)
* ough

* ough

* poke_sound

* Required changes

* indent

* move cooldown
2024-03-11 09:36:34 +00:00
RustingWithYou
ac435b98e2 Unathi Religious Items & Nullrod Tweaks (#18572)
* sk'akh robes and shaman staff

* nullrod religion restrictions

* ye

* prevents atheists waving a tajaran charm around

* the purity of the blessed machine

* changelog

* Update code/game/objects/items/weapons/chaplain_items.dm

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

* Update code/game/objects/items/weapons/chaplain_items.dm

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

* Update code/modules/clothing/under/xenos/unathi.dm

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

* nullrods on religion datum & icon fix

* underscore

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-03-11 09:31:04 +00:00
Sniblet
284c1e76dd Personel > personnel, ops personnel glare dampener fix (#18624)
* the pr

* buxfix
2024-03-10 11:32:28 +00:00
RustingWithYou
84dbb088e4 No Hulk Screaming for Vaurca & IPCs (#18598)
* no more SCREAMING

* yeagh

* and a fix
2024-03-10 11:32:25 +00:00
Fluffy
3236d83cc2 Ballon Alerts and Baloon Chat update (#18587)
* asdf

* sdfa

* sdf

* fghd

* sdf

* dsaf

* sdfsad

* offset more, hopefully fix harddel 4real this time

* sadf
2024-03-09 22:12:20 +00:00
tomixcomics
a61b3d0f2a Eating in Aoyama (New foods, drinks and plants (and some ports!)) (#18605)
* so many theengs!

* Let's commit!

because I haven't in a while!

* final commit fo rnow

* added changelog

* Update TOMIXCOMICS-PR.yml

* ugh

i should've known it was a jinx to refer to a commit as 'final'. bleh.

* added new ramen dish to the ramen vending machine in PV

meant to do that before submitting but had issues with it.
2024-03-09 22:12:06 +00:00
Fluffy
8cb5952203 sdfaas (#18609) 2024-03-09 20:00:21 +00:00
RustingWithYou
c0e2df4a02 Point Verdant ERT-Lite (#18554)
* point verdant ert-lite

* fixes bad outfit

* fixes garage

* fix to existing kasf ert
2024-03-06 07:10:48 +00:00
Ben
a58283353d Hard deletes fun from Konyang (Point Verdant Radio Changes) (#18560)
* Konyang Radio

* Changelog spell

* Requested Changes (kill me)

* more

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
2024-03-05 18:06:03 +00:00
Fluffy
543101d2f1 sdfasd (#18589) 2024-03-04 09:15:51 +00:00
Fluffy
cf056641d3 dgdsg (#18575) 2024-03-03 19:52:57 +00:00
TheStryker
4f85a6e9a5 Makes 5-Cheung hideout fancier. (#18568)
* adds ramen machine

* Add files via upload

* Add files via upload

* Add files via upload

* adds ramen vending code

* Add files via upload

* adds samurai armor description

* adds the tsunami kami

* adds the maps

lancer please never make me do this again without github desktop

* Puts the God Damn stairs back

* Add files via upload

* Puts the God Damn clinic back

* Readds The Keys and fixes The Spawners

* fixes The Keys

* Fixes third floor area
2024-03-03 19:52:52 +00:00
RustingWithYou
40334cecbb Ire of the Betrayed - The Hiskyn Revanchist Ship (#18550)
* brothers, do we ball?

* testing testing

* we actually fucking ball dude

* fluff

* names

* hiskyn flag

* addresses some requested changes

* few more requested changes

* shuttle & thruster fixes
2024-03-02 11:25:47 +00:00
Greenjoe12345
22d0840e31 birb (#18548) 2024-03-01 18:53:48 +00:00
Fluffy
9fc52575dd Refactored MouseDrop_T (#18549)
* sdafas

* sdaf
2024-02-29 21:58:23 +00:00
RustingWithYou
aed50820ec fixes chainlink fences being leapable (#18536) 2024-02-29 17:39:01 +00:00
Fluffy
0df26f261d sdaf (#18574) 2024-02-29 17:37:43 +00:00
Fluffy
4fe26b6f6d Fixed sound tokens still listening to destroy events (#18573)
* fsdaf

* sdf
2024-02-29 17:37:29 +00:00
RustingWithYou
1dabbfb301 Various Melee Tweaks (#18497)
* blatant melee buffs

* esword tweaking
2024-02-26 23:35:39 +00:00
SleepyGemmy
03279db41b Analog Radio Fix (#18544) 2024-02-26 23:33:47 +00:00
Matt Atlas
13cbf1267e Added a new mob and a weapon for Purpose. (#18500)
* extreme measures

* hunter killer

* Adds a new mob and a weapon for Purpose.

* cl

* Update code/modules/clothing/spacesuits/rig/suits/terminator.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>

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

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>

---------

Signed-off-by: Matt Atlas <mattiathebest2000@hotmail.it>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2024-02-26 08:47:49 +00:00
shimmeristaken
352ce87c28 Adds a Venusian flag, and fixes a pathing issue. (#18507)
* Adds Venusian flag plus fixes rustings folly

* changelog plus adding to loadout!

* fixes mistake
2024-02-26 08:47:41 +00:00
SleepyGemmy
06411779df Adds the Peaked Beret (#18484)
* Adds the Peaked Beret

* Sprite Names Fix

* Sprite Tweaks

* Sprite Tweaks Deuxième Partie
2024-02-24 11:32:58 +00:00
Alberyk
13f1059e4c Adds a lore analog radio (#18204)
* radio stuff

* loads of code

* more news

* mor eradio stuff

* final fixes

* radio

* Lore Radio Tweaks (#32)

* adds geeves

* matt request

---------

Co-authored-by: Geeves <ggrobler447@gmail.com>
2024-02-23 15:44:53 +00:00
lavillastrangiato
08b9bab07c Fixes TIC extended descriptions and makes them wallet-able (#18462)
* thisisprobablyshitcode

* a quick consistency edit

* aeo

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Signed-off-by: lavillastrangiato <63124803+lavillastrangiato@users.noreply.github.com>

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

john madden john madden

Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Signed-off-by: lavillastrangiato <63124803+lavillastrangiato@users.noreply.github.com>

---------

Signed-off-by: lavillastrangiato <63124803+lavillastrangiato@users.noreply.github.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
2024-02-22 11:57:52 +00:00
DreamySkrell
2aeb0f7593 Small potted plants (#18432)
* t423efwgvd

* 3tgwev

---------

Co-authored-by: DreamySkrell <>
2024-02-21 12:30:37 +00:00
shimmeristaken
877c5ba18a Adds a Callistean flag to the loadout (#18453)
* tired

* asd

* onemore

* hi

* fixed an apostrophe @snowy@snowy@snowy@snowy@snowy
2024-02-21 12:30:24 +00:00
Matt Atlas
e063223199 Fixes the exosuit mounted autolathe. (#18440)
* autolathe1

* cl

* Oops

* pay the price

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-02-20 11:58:39 +00:00
DreamySkrell
2446ea5488 4ryghbf (#18430)
Co-authored-by: DreamySkrell <>
2024-02-20 11:44:01 +00:00
Fluffy
91e89a3d73 Attempt fix blackscreen (#18434)
* first reordering, committed in case i fuck up badly next

* from the moment i understood the weakness of my flesh

* sdafa

* you asked for this

* we can't have nice things

* sdafasdf

* sdafasd

* sdfa

* fsa

* worth a shot

* more pain

* sdfasdf
2024-02-20 11:37:52 +00:00
Fluffy
4311296f91 Stairs unit test (#18465)
* sdf

* fsaddf

* sadf

* sadf

* expanded documentation on stairs
2024-02-20 11:37:30 +00:00
kyres1
e4c05ce3b9 Fixes Point Verdant Code and Mapping Issues (#18448)
* AAAAHHHH

* retracts changes
2024-02-19 11:45:22 +00:00
SleepyGemmy
42dbe11930 Fixes the Hull Beacons Colours (#18446) 2024-02-18 11:07:29 +00:00
feartheblackout
ccc4a6a1b7 Adds a handheld microphone for Journalists (#18380)
* Adds a handheld microphone for Journalists

* Changelog

* fixes

* fix perhaps

* real fix i think
2024-02-17 11:42:54 +00:00
Werner
fbe4dc5921 Revert "Event/Away Site Sprite Spring Cleaning (#18318)" (#18435)
This reverts commit 320c482f51.
2024-02-17 11:32:51 +00:00
DreamySkrell
713c5d1448 k'ois MRE (#18361)
* m

* ahret

* 3

* tests rerun please

* spr

* 234twfegsdv

* tests rerun please

---------

Co-authored-by: DreamySkrell <>
2024-02-16 11:49:41 +00:00
Wowzewow (Wezzy)
320c482f51 Event/Away Site Sprite Spring Cleaning (#18318)
* Event/Away Site Sprite Spring Cleaning

* whoops

* fixes

* news

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/light_pole.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* Update code/game/objects/structures/decorative.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>

* prop hunt

* Gamers

* merge conflict again

* really

* signs

---------

Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-02-16 11:16:22 +00:00
DreamySkrell
81e7565431 Survey Probe (#18359)
* s

* cc

* hhh

* generate_survey_result -> generate_ground_survey_result

* hhh4

* h64

* htr

* 3

* tt

* 4

* c

* h

* Update code/game/objects/structures/survey_probe.dm

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

* Update code/game/objects/structures/survey_probe.dm

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

* review

* 5thng

* 54yhtgn

---------

Signed-off-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Co-authored-by: DreamySkrell <>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2024-02-13 20:48:50 +00:00
Fluffy
9afe761db3 Some refactors, DMDoc and UT (#18365)
* dsfa

* accessories fix

* fixed "has been hit by" message with intent check

* sdfa
2024-02-12 15:32:23 +00:00
Matt Atlas
4423d03f2f Adds examine boxes. (#18370)
* Adds examine boxes.

* lint

* what kind of dreams did you dream?

* unlimited

* midgardsormr

* sdsd

* fixes

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2024-02-11 21:58:20 +00:00