Commit Graph

7888 Commits

Author SHA1 Message Date
N8-Toe
5416a95c9d Gives XO their hat in their locker (#16362)
* gives XO a hat

a hat in time

* I did it again

---------

Co-authored-by: Nate <n8toepotato@gmail.com>
2023-05-20 15:21:08 +00:00
Wowzewow (Wezzy)
5735f31150 Custom Item Flag Fixes (#16344)
* Custom Item Flag Fixes

Fixes #16299

* cteum fix
2023-05-19 19:14:52 +00:00
smellie
f237ea8309 Antag Dirty Bombs & Bodyhorror Parasites (#16317)
* dirty bombs & bodyhorror

* clean up + extra flavour

CE_ANTIEMETIC taken into account in the delayed_vomit() proc. doesn't need to subtract from CE_EMETIC anymore.

* desc. fix, TC tweak, syringe gun kit

* dirty bomb tweaks

radiation remains for as long as advertised (~8mins in an open space)
it also actually leaves behind the green goo now.
2023-05-16 00:34:10 +00:00
Pirouette
9f238c360b plant -> planet (#16325) 2023-05-12 18:59:06 +00:00
RustingWithYou
d9e9497a2b Tarwa Conglomerate V2 - Merge Conflict Free (#16281)
* tarwa conglomerate ship

* changelog

* file structure changes

* spawning works properly

* tarwa flags

* changelog

* welcome messages

* more file structure tweaks bc of rebase

* shuttle and flag fixes

* fixes tarwa flag name

* diona airless floors

* airlock floor fix

* replaces prefab airlock with a real one
2023-05-08 11:29:54 +00:00
RustingWithYou
5c31da73ae Honor, Fire, Burn Thy Fear - the Hegemony Corvette (#16261)
* hegemony corvette 1

* hegemony weapons, armor, sprites

* hegemony corvette 2

* hegemony corvette 3

* changelog

* description

* trophy room stuff

* ghostspawner fix

* blast doors

* fixes fucked key

* window fixes

* unit test fixes

* unit test fixes 2

* energy glaive inhand sprites

* new shuttle + extra docking

* vaurca ghostrole adjustment

* extra trophy room stuff + breacher

* file structure tweaks

makes future hegemony ships easier to add

* shuttle sensor suite + iff

* entry points on shuttle

* carpspawns

* plating fix

* nerfs the hegemony energy rifle

* welcome messages

* airlock exterior vent

* airlock tweaks to make it work more gooder

* flag fixes

* more flag fixes

* fixes bz_gorget file (#16282)

* bz_gorget

* fixes bz_gorget file

* shuttle rename for lore reasons
2023-05-07 08:22:14 +00:00
Wowzewow (Wezzy)
217c9a4b69 flag fix (#16285) 2023-05-05 03:21:55 +00:00
Geeves
8ea39f9dbd Colorable Glasses (#16246) 2023-05-01 19:09:56 +00:00
Wowzewow (Wezzy)
76e02c0f95 Vexillology (#16237)
* Vexillology

* dock-u-ment-ation

* RAHH BANNERS

* oops

* Kid Named Mapping

* bismillah

* least esoteric problem
2023-05-01 19:08:58 +00:00
Geeves
ef7979ff67 Clickable Storage Backgrounds (#16249)
* Clickable Storage Backgrounds

* ye
2023-04-30 21:11:13 +00:00
harryob
578bae6f6f no relative pathing (#16234)
* the voices win in the end

* cleanup

* changelog

* secure.dm hates me

* make_exact_fit() in initialize instead of whatever was happening before
2023-04-30 21:10:13 +00:00
Alberyk
dda849d548 The Circus is Here (#15874)
* circus

* code stuff

* Fixes

* the circus is here

* The funny

* Final touch

* things

* Fixes

* area fix

* More spawn and item fixes

* More fixes

* Fix mind

* changelog

* stuff

* tweaks

* Fixes

* circus

* a

* fixes

* areas

* finally

* changelog

* circus fix

* hidden

* Shuttle fix

* Shuttle fix

* circus

* The circus is here for real

* Fixes

* fixes

* tweak

* Should be fixed

* Area fix

* shuttler

* Forgot some stuff
2023-04-30 21:10:08 +00:00
N8-Toe
cb2a9be179 Adds Hat to BC locker (#16256)
hat time

Co-authored-by: Nate <n8toepotato@gmail.com>
2023-04-29 09:29:12 +00:00
sheeplets
fbfa5ed016 Returns stabilizer harnesses to their former glory (#16257)
* Fuck it, we ball

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

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

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-04-27 03:30:05 +00:00
Wildkins
9f1bdd2847 Exoplanet Overhaul: The Shape of Things to Come (#16216)
* the end of the beginning

* SPEED

* SPEED

* we real speed

* fix ore gen

* re-organize exoplanet stuff

* reorg and rename defines, fix ores

* Everything Else

* 1.2.0+a3 rust_g

* fix merge

* get rid of noise maps

* fix adhomai, delete random maps

* make adhomai poggers or something idk

* debug

* crystal planet, misc bugfixes

* fixes

* log

* change mineral gen to make adhomai work

* try this

* huh

* huhw

* rust_g 1.2.0+a4

* port adhomai changes to correct file

* fix for rock nomad

* bugfixes
2023-04-25 13:48:54 +00:00
meep109
1ff750fd34 Adds Diulszi as an option to the Nralakk projector (#16223)
* Diuluzi!

* Update skrell.dm

* Create meep109_diulsziprojector.yml
2023-04-24 15:47:37 +00:00
Sniblet
7edfbb5d78 Removes a bad apostrophe from kitten plushies (#16230)
* Update toys.dm

* Create sniblet-it_is.yml
2023-04-23 10:50:05 +00:00
Geeves
b36483b9aa IPC Overloaders (#15900)
* IPC Overloaders

* better map

* stuff

* slogans

* finishing touches

* force of habit

* speedy testing

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

Co-authored-by: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>

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

Co-authored-by: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>

* kyres sprites

* map it back in

* ovaloada

* map it back in

* thank u CI

---------

Co-authored-by: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
2023-04-15 11:45:28 +00:00
Wildkins
3f4786ab23 Fix several hard-dels, add harddel ref tracking (#16174) 2023-04-10 20:42:20 +00:00
Cody Brittain
958a3494e5 Two new pipe types (Redux) (#16141)
* Added two new pipes: Fuel and Auxiliary Pipes

* Added a `cycle_to_external_air` tag to airlock controllers, which allows exterior air to be cycled out of an air lock through separate vents.

* Retrofitted the Spark and Intrepid with the new pipes, and the externally cycled air.

* CL

* Allow pressure tanks to attach to all pipes.

* RM stray pixels

* Update code/game/machinery/pipe/construction.dm

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

* rm unused states

* Fix misalignment

* Add remaining pipes to RFD, and correct a few omissions

* Fix airlocks not changing their state properly, and ensure that docking -always- forces airlocks to externally cycle.

* Remove externally cycled airlock from the Spark

* CL

* Add enough pressure to the Intrepid auxiliary line to ensure both airlocks can be pressurized consistently.

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-04-10 17:36:08 +00:00
kyres1
9ea2410639 Massive rec area remap into double holodecks (#16103)
* part 1 abloobloobloo

* BY GOD IT WORKS

* Moghes and konyang plus fucking everything else

* jupiter and biesel woohoo

* tweaks and feedback. places CIC and scuttler

* changelog and fixes

* life is agony

* about done

* arrow's changes

* fixes some shit
2023-04-10 17:31:12 +00:00
Matt Atlas
fee7deabd7 Fixes a lot of bugs. (#16187)
* Fixes a lot of bugs.

* fix more shit

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-04-10 17:29:16 +00:00
Matt Atlas
ab5d39db19 Ports SStyping from Nebula. (#16169)
* Ports SStyping from Nebula.

* the spook

* a

* fix

* bring the fanfare to its knees

* add a speech bubble type pref

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-04-10 00:08:48 +00:00
feartheblackout
5cc5dd3001 Allows examining the ID menu for IDs in wallets or modular computers (#16168)
Co-authored-by: Gabby <martinezgabby576@gmail.com>
2023-04-09 18:43:22 +00:00
Yonnimer
44f980f45c Adds some new EUM-centric things (#16076)
* Adds more EUM Origins

* Adds a new Dionae accent

* adds a new dionae accent2

* dionae religions p1

* dionae religions p2

* adds a missing "

* Adds a skrell EUM origin (credit to Brotendo)

* Adds the Skrell EUM accent (Credit to Brotendo)

* Adds the Skrell EUM accent (Credit to Brotendo)

* Adds some skrell religions to the nraldaaq origin

* Adds EUM Consulars(?)

i have no idea if this is gonna work lol

* sprites

* New accent sprites

* accents for real hopefully

* changelog

* removes a duped EUM consular thingy

* fixes

* \ not /

* error fixes

* fixes a space

* more error fixes

* Adds diona citizenship

* e

* o

* even more error fixes

* i had one job and i put a d not e

* Adds the EUM flag sprite

* Adds some new dionae clothing sprites

* Adds the floral tunic item

* Adds the eumponcho item (replace the placeholders)

* (Hopefully) does the eum poncho correctly

* Adds the eum flag

* Adds stuff to the loadout

* Adds an actual description for the poncho

* removes an extra space

* Adds an actual description to the poncho

* Fixes the dionae poncho not having a suit sprite

* Adds the blood eternal robes to the loadout

* Forgetti to add skrell_eum to possible origins

* ,

* accents merge fix

* letter fix

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

* letter fix2

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

* letter fix3

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

* letter fix4, revenge of copypasteing

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

* hopefully last letter fix

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

---------

Co-authored-by: Alberyk <Alberyk@users.noreply.github.com>
2023-04-09 10:40:01 +00:00
garnascus
889a477798 Tranquilizer box fix (#16165)
* Tranquilizer box fix

* tranquilizer-box-fix

* Update html/changelogs/Garnascus-tranquilizerboxfix.yml

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

* Update html/changelogs/Garnascus-tranquilizerboxfix.yml

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

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-04-07 12:13:34 +00:00
Fluffy
a4f8285686 Refactor of, and more, unit tests (#16065)
* Initial experiment

* holy shit the pain of this rabbit hole

* F

* F

* F

* F

* FFF

* FFFF

* FFFFFFFFF

* FFFFFFFFFF

* FF

* ffffff

* ffffffff

* F^F

* FFFFFF

* F

* Robusted

* F

* Some readability, hopefully

* Fear

* Aurora was a mistake

* Horrors beyond our comprehension

* Use the appropriate macro across the tests

* Brah

* FF

* Mute janitors robusting the ling

* Frail doctors revealing to be more trained than a KGB sleeper agent when the crew armory opens

* FFFFFFF

* gujbjh

* Shitcode, shitcode everywhere

* Pain

* Cursed codebase

* Fix AI mask qdel, SQL tests to macro

* Attempt at github grouping

* Take two

* Brah

* Maybe this looks better

* Different formatting

* FFS

* Visuals

* pain

* FFFFF

* hyuh

* fgdsgd

* igyguybujgb

* Just calling the parent here

* dsfs

* fdsaf

* Move more pieces to use the macros

* Finish moving to macro

* gah

* Changelog, some touchups

* Fix another found runtime

* GDI
2023-04-03 10:47:31 +00:00
Cody Brittain
71a92787ea Fix health analyzer icon (#16151)
* Fix health scanner port

* CL

* Update code/game/objects/items/devices/scanners.dm
2023-03-31 17:50:17 +00:00
Cody Brittain
89855cff39 Made several improvements to flashlights (#16050)
* Made several improvements to flashlights, and added a sprite for device cells

* CL

* Added lathe recipes, and made eCigs use device power cells

* Add another entry to CL

* Fix nested cell

* Added `desc_info` to all flashlights, to teach the player about removing the cells and turning them on.

* Update code/game/objects/items/devices/lighting/lamp.dm

* More cleanup

* Allow Flashlights to use rechargers

* Apply suggestions from code review

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

* Update flare.dm

* Update flashlight.dm

Fix broken code review suggestion

* Update flare.dm

Ditto

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-03-31 17:46:06 +00:00
Wildkins
5ba6eccd9a Fix ruin spawning, LZ deletion, UTs and more (#16068)
* Fix ruin spawning, LZ deletion, UTs and more

* augh

* fix AST exoplanet generation for real

* Fix landing zones turning into rock walls

* fix awaysite runtimes

* im blind

* missed one

* split exoplanet UTs to new UT

* comments

* obj path fixes
2023-03-29 18:44:24 +00:00
Alberyk
e020c30033 Revives: Plates, Bowls and More Plates (#16085)
* kitchen stuff

* fucking hell just use tabs

* suffering goes on

* oh the misery

* map stuff

* aaaugh

* no more

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

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

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

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/trays.dm

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

* Update code/modules/cooking/trays.dm

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

* request

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

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

* Update code/modules/cooking/plates.dm

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

* Update code/modules/cooking/plates.dm

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

* horizon fix

* horizon fix

* things

* Fixes

* icon update

* UNfucks stuff

* oh the misery

* jesus above

* stop using spaces

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-28 19:00:57 +00:00
Llywelwyn
e17a924751 Skrell recreational additions: 2 brands of cigarettes, 2 brands of chewing tobacco, wulumunusha cigarettes (#16091)
* initial commit with placeholders

- adds wulumunusha cigarette variant
- adds federation (tobacco) and traverse (wulu) cigarette packets w/ placeholder names and description

* initial fixes + changes for skrell team

- fixes sprite names
- removes the initial_affect from wulu extract; it's slow-acting, there should be no instantaneously noticeable effect
- traverse cigarettes no longer contain wulu, and instead are now mentholated with dyn
- traverse cigarettes are now added to vendors
- separate wulu cigarette added as a placeholder pending lore decision

* chewing tobacco and brand names

- brand names
- regular and menthol (dyn) chewables added
- added to loadout/vendors
- sprite changes

* descriptions + flavours

- added descriptions given by skrell team
- changed contents to give proper flavour messages

* cl, and wulu flavour description

- adds cl
- changes wulu flavour desc
- restricts diona from selecting the wulu pouch

* fixes

- adds wulu cigarette description

* updates packet descriptions

- short and wide

* pedantic description change

the old description bothered me

* adverbs of frequency go before the verb

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

erroneous comma

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

* ash-tray to ashtray on all the descriptions whilst we're here

and wulu desc changed by brotendo's request

* Typo Fix

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-28 12:40:42 +00:00
Alberyk
834ab29ce1 Revert "Added two new pipes: Fuel and Auxiliary Pipes, and added a new Airlock mode to cycle external air. (#16083)" (#16138)
This reverts commit 329e4da321.
2023-03-28 01:51:23 +00:00
Cody Brittain
329e4da321 Added two new pipes: Fuel and Auxiliary Pipes, and added a new Airlock mode to cycle external air. (#16083)
* Added two new pipes: Fuel and Auxiliary Pipes

* Added a `cycle_to_external_air` tag to airlock controllers, which allows exterior air to be cycled out of an air lock through separate vents.

* Retrofitted the Spark and Intrepid with the new pipes, and the externally cycled air.

* CL

* Allow pressure tanks to attach to all pipes.

* RM stray pixels

* Update code/game/machinery/pipe/construction.dm

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

* rm unused states

* Fix misalignment

* Add remaining pipes to RFD, and correct a few omissions

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-27 20:57:47 +00:00
feartheblackout
d0532a16e8 Library computers now print generic bibles + More sprite choices for setting bibles (#16033)
* Library computers now print generic bibles

* Changelog

* Fixes + adds more bible sprite choices

---------

Co-authored-by: Gabby <martinezgabby576@gmail.com>
2023-03-27 16:16:38 +00:00
Fluffy
71538bfe4f Fixed bush initialize (#16123) 2023-03-27 15:44:56 +00:00
Fluffy
a7aee1ed8f fix (#16111) 2023-03-26 17:47:16 +00:00
Fluffy
3225a1d30c Fix radio encryption keys Initialize (#16109)
* fix

* Correct Changelog Entry Type

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-26 12:58:09 +00:00
Fluffy
e4e99310ae fix (#16110) 2023-03-26 12:57:51 +00:00
Fluffy
efa4d73c07 fix (#16112) 2023-03-26 12:57:15 +00:00
Fluffy
699db89e94 Fix statue Initialize() (#16113)
* fix

* Correct Changelog Entry Type

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-26 12:57:00 +00:00
Fluffy
277a433e9f fix (#16114) 2023-03-26 12:56:23 +00:00
Fluffy
54bd127a29 INITIALIZE_HINT_PLZSENDHELP (#16089) 2023-03-24 21:35:19 +00:00
Fluffy
32d83f56df Pain (#16088) 2023-03-24 21:35:07 +00:00
SleepyGemmy
1e34d71cc4 Service Map Fixes (#16018)
* Service Fixes

* Fix Wrong Way Disp. Pipe

* Freezer and Refrigerator Fixes

* Fix Chicken Map Icon

* Compatibility

* Typo

* Proper Chicken and Fish Freezer

* Remove Extra Hen
2023-03-23 22:59:30 +00:00
Fluffy
478fe120b2 Gambling with what breaks and how badly is our pasttime now (#16079) 2023-03-23 22:58:38 +00:00
Fluffy
261aa56d9d Dear lord... (#16078) 2023-03-23 22:58:34 +00:00
OddHerring
300cf0a9f0 Adds Solarian Army service uniforms, modifies Navy uniforms, and other such things. (#15959)
* The Changes

* fixes mistakes

* fixes more mistakes

* this should be it

* ok maybe this is it
2023-03-19 11:22:40 +00:00
Avery Marie
443b842ec0 Tweaks the Vault as needed (#16054)
* Tweaks the Vault as needed

* Connects the proper disposals

* Oopsies I messed up the Changelog

* f

* For some reason the piping wasn't showing up?

* makes the decals match

* Update html/changelogs/Eyeveri_VaultTweaks.yml

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

* Corrects the Camera tags

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-19 03:25:46 +00:00
SleepyGemmy
91ec2fb44e Herring Gull Plushie Fix (#16049) 2023-03-19 02:28:55 +00:00