Commit Graph

20640 Commits

Author SHA1 Message Date
Fluffy
8adeb2f052 fix (#16137) 2023-03-29 01:37:23 +00:00
WickedCybs
769bbe7dbd ling (#15678)
Co-authored-by: WickedCybs <wickedcybs@gmail.com>
2023-03-28 20:55:49 +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
Fluffy
702c411409 Fix nuclear gun updates procs (#16135) 2023-03-27 19:46:04 +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
0a0ec9e68c Fix stairs initialize (#16124)
* Fixed stairs initialize

* spelling
2023-03-27 15:44:07 +00:00
Fluffy
414cc3628d Fixed antimatter shield initialize (#16125) 2023-03-27 15:43:47 +00:00
Fluffy
58e94b6527 Fixed mobcorpose initialize (#16126) 2023-03-27 15:43:11 +00:00
Fluffy
aed4285898 Fixed minedrone FindOre runtime (#16127) 2023-03-27 15:42:25 +00:00
Fluffy
fafc3e04a8 Fixed gravgen Destroy (#16128) 2023-03-27 15:41:23 +00:00
Fluffy
2e183a7895 Fixed screen mecha Initialize (#16129) 2023-03-27 15:40:53 +00:00
Fluffy
24e2c08caf Fix mech flare Initialize (#16130) 2023-03-27 15:40:39 +00:00
Fluffy
a9100fedd4 Fixed ai mask Initialize (#16131) 2023-03-27 15:40:22 +00:00
Fluffy
d0c40255cf Fix xmaxgift Initialize (#16133) 2023-03-27 15:39:03 +00:00
Alberyk
021ecad814 The lazarus injector can no longer revive mobs that are not tameable. (#16082) 2023-03-26 23:18:38 +00:00
Fluffy
83eff6d13d Fix telescience stationary GPS Initialize (#16118)
* fix

* gdi
2023-03-26 17:47:05 +00:00
Fluffy
19b920c723 fix (#16116) 2023-03-26 12:55:43 +00:00
Fluffy
39d0b69d9e fix (#16117) 2023-03-26 12:55:13 +00:00
Fluffy
fa5425dd2c Fix hivebot beacon initialize (#16119)
* Fix

* changelog

* author
2023-03-26 12:53:40 +00:00
SleepyGemmy
242ce2c2f2 Carp Event Tweaks (#15988)
* Fore Deck 2 Carp Spawn Tweak

* Re-adds the Spawn

* Removes Unused Proc

* Removes Carp Random Events

* CL

* CL

* Spacing

* Excel File
2023-03-23 23:12:24 +00:00
WilliamMurdoch
056e7b71c8 Adds CMO labcoats to loadout (#15819)
* Adds CMO labcoats to loadout

* Wrong folder :waa:

* Update code/modules/client/preference_setup/loadout/loadout_suit.dm

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

* Duplicate Whitespace Removal

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-23 23:05:17 +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
136cd87268 Slimes Atomization (#16080) 2023-03-23 22:58:41 +00:00
Llywelwyn
73ab7640e2 Replaces mentions of the genophage and the Jargon Federation with their superseded names (#16072)
* genophage to X'Lu'oa

- replaces all mention of 'genophage' with 'X'Lu'oa'

* jargon to Nralakk

- replaces all remaining mentions of 'Jargon Federation' with 'Nralakk Federation'
2023-03-23 13:58:12 +00:00
MortalRed
7f01544027 Cochlear Implant price reduction. (#16062)
* I heard it through the grapevine

* i swear I passed english class

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

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-03-23 13:58:06 +00:00
Ramke
4ae0ee994b tajcups (#16058) 2023-03-22 22:40:48 +00:00
Fluffy
2cccb4a5c9 Use rustg 1.2.0+a2 (from our other repo), update our pipeline, fix what's needed to not make it fail (#16051)
* Let's see how this goes, updated the versions of various dependencies

* Changelog

* Didn't we merge a fix for those already? Anyways...

* Almost...

* Switch flyway to 9.9.0 instead

* Forgot one place where this is doubly defined

* Package dependency attempt fix

* Try to run on latest ubuntu version

* Forgot one

* Try to force cffi consistency

* Other way around

* aurora was a mistake

* Like this more?

* Stupid pipeline

* F

* FF

* Bruh ZAS

* GDI

* FFS ZAS + UT

* Checked maps, temp is set as this in there, so updating ZAS UT, wich was probably conked before

* All AI rooms are in normal expectation, so updating ZAS UT for it

* First attempt at making the AI area in the Horizon cooled

* F

* And the old aurora

* Remove version binding on requirements

* Updated changelog

* Spelling

* Binds versions again, as majority voted
2023-03-22 19:50:15 +00:00
Wowzewow (Wezzy)
3cd7bf91b6 Crutch Mechanics (#16011)
* Crutch Mechanics

* Update human_movement.dm
2023-03-20 01:29:18 +00:00
Ramke
a1531fc90e finishes what must be done (#16059) 2023-03-20 01:28:58 +00:00
TheDanseMacabre
411fa0f101 Major Changeling Tweaks (#15993)
* wadawd

* Revert "revert"

This reverts commit 55e480dd85.

* w

* w

* w

* a

* w

* you can no longer grab The Thing

---------

Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-03-19 11:42:51 +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
Fluffy
2651070281 Tracy verb to proc (#16057)
* Turn tracy verb to proc, let's see if it actually hides, as this is the only difference from others in its category

* Changelog

* Reword changelog

* Update html/changelogs/Fluffyghost-tracyverbtoproc.yml

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-19 03:36:33 +01:00
Fluffy
da357b2659 Tracy Performance Profiler Addition (#15875)
* Initial commit

* Tracy 0.8.2, debug verb to start it

* Changelog
2023-03-18 23:27:37 +01:00
Ramke
04253d2b11 Tajara Food Expansion (#16035)
* sprites

* code

* fixes

* fixes

* changelog

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

FluffyGhoster's capitalisation fix

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

* adds missing descriptions, trash

* re-adds neaera meat

* Update code/modules/cooking/recipes/cultural/recipes_tajara.dm

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

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

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

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

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

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

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

* updates changelog

* updates changelog more

* Update html/changelogs/ramke - tajfoodexpansion.yml

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

* grammar fixes

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

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

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-03-18 19:57:08 +00:00
Avery Marie
d161021331 Payday 2: Aurora Edition (#16006)
* Adds a custom vault weapon display case

* WIP

* wip 2

* belh

* Vault and Token

* Changelog

* Tweaks Vault Loot

* air alarm

* LMAO i forgot to delete random phoron

* Fixes the lockers. This is everything.

* Fixes the code and adds a inhibitor

* Reworks to meet requested changes

Removes the vault token as requested.

* Adjusts inhibitor
2023-03-17 17:59:12 +00:00
Wowzewow (Wezzy)
0aabab00f9 Wristbound resprite (#16016)
* Wristbound resprite

backlog

* oop

* Update preset_wristbound.dm

* fuckery
2023-03-17 17:07:01 +00:00
TheDanseMacabre
bd8742f277 Visegradi Clothes PR (#15872)
* ww

* ww

* awd

* wdadw

* waadaw

* wadwad

* dawad

* adw

* wad

* d

* awd

* ddw

* awd

* adw

* daw

* awd

* adw

* adw

* I woke up in a new

* Update code/modules/clothing/under/accessories/shirts.dm

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

* Update code/modules/client/preference_setup/loadout/loadout_suit.dm

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

* d

* adw

* adw

* dawd

* Update code/modules/clothing/head/misc_special.dm

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

---------

Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-17 17:06:30 +00:00
Sniblet
97f7c9da19 Item description grammar updates (#16041)
* the pr

illiterates owned

* Update html/changelogs/sniblet-overture.yml

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

* more things

* remove stupid

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-17 17:06:16 +00:00
SleepyGemmy
2c442b600f Herring Gull Plushie (#16028)
* Herring Gull Plushie

* Tucking in Legs

* Actually Set the Variable
2023-03-16 21:16:45 +00:00
SleepyGemmy
87a195d35c Two Issue Fixes (#16032) 2023-03-16 00:36:31 +00:00
feartheblackout
8aa1728037 Fixes Assunzione robe sprites (#16029)
Co-authored-by: Gabby <martinezgabby576@gmail.com>
2023-03-15 04:41:11 +00:00
Wildkins
c369124fe9 Increase error logging to diagnose server conking (#15662)
* Increase error logging to diagnose server conking

* more logging and db retry

* whoops

* rename error() to log_error() to better reflect what it does
Move a bunch of world.log messages to log_error

* Fix compile error

---------

Co-authored-by: Werner <Arrow768@users.noreply.github.com>
2023-03-13 21:51:39 +00:00
Alberyk
bc5b828ca0 Adds a new Adhomai random ruin: the Rredouane Shrine (#15999)
* Adds a new Adhomai random ruin: the Rredouane Shrine

* changelog

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

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-13 21:43:20 +00:00
Wildkins
209a0a2e0f Cleaning up some runtimes (#16027) 2023-03-13 19:22:43 +00:00
Matt Atlas
0ab34879d1 Adds a few changeling abilities ported from Polaris. (#15851)
* I got a fever, don't breathe on me... I'm a believer in nobody... Won't let me leave cause I've seen something... Hope I don't ah-choo!

* joe biden

* teardrops

* no emag

* ddd

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-03-13 19:18:58 +00:00
RustingWithYou
4153f55d33 Vaurca Bulwarks and Workers can now select the integrated drill augment (#15963)
* integrated drill... for buge

* drill stuff 2

* changelog

* adds drills to workers as well

* changelog 2

* Update code/modules/client/preference_setup/loadout/loadout_augments.dm

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

* Update html/changelogs/RustingWithYou - striketheearth.yml

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

* re-capitalises words

Bulwark and Bound Worker re-capitalised at Vaurca team request

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-13 19:14:49 +00:00
SleepyGemmy
df320338e9 Kitchen Sprites Tweak (#15991)
* Kitchen Sprites Tweak

* Colour Change; Blank Sprite Removal

* Minor Tweak

* Beekeeping

* Sprite Name Fix

* CL

* Beehive Assembly; Bee Net

* Merge Conflict Resolution
2023-03-13 19:14:43 +00:00