Commit Graph

20167 Commits

Author SHA1 Message Date
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
SleepyGemmy
f1a4d16fce Fixes the Corn Dog Recipe (#16004) 2023-03-13 19:14:31 +00:00
Alberyk
c84d786cf9 PRA and DPRA consular officers alternative uniforms and hats (#15973)
* PRA and DPRA consular officers alternative uniforms and hats

* missing cap whoops
2023-03-13 19:14:21 +00:00
Wildkins
cc2966ff34 Another 515 Casualty (#16017) 2023-03-13 00:34:00 +00:00
Alberyk
9c18846eb5 Fixes custom item duplicate path (#16013) 2023-03-12 16:27:27 +00:00
Wildkins
b663e93c0e Fix reagent data (#16010)
* Fix reagent data

* walter augh sound effect (bass boosted)
2023-03-12 11:01:50 +00:00
kyres1
af94d54379 Fixes belt selection being broken (#16008)
* fixed??/

* I seriously fucked up a changelog come on
2023-03-12 00:01:35 +00:00
meep109
0f07c00520 Fixes psi-ping sprites lingering (#15928)
* timer bugfix

* Create meep109_psibugfix.yml
2023-03-11 16:06:18 +00:00
Alberyk
0fb2d34b77 Custom items 04/03/23 (#15950)
* Custom items 04/03/23

* Tweaks

* Compile
2023-03-11 16:05:33 +00:00
kyres1
7bc5666e9e Earring/necklace/belt selection expansion (#15965)
* jewelry p1

* part 2 belts and stuff

* finishing up

* contained belts

* gem suggestions

* ok nvm
2023-03-11 16:05:15 +00:00
Alberyk
6f36a9d742 Tweaks overmap planets colors (#15984) 2023-03-11 16:04:28 +00:00
RyverStyx
e106fbefec Adds Eight New Skrell Headtail Styles (#15969)
* Adds new styles

* Update sprite_accessories.dm

* Create hurt.yml

* Fix

* Fixed front view of the headrtail behind sprite

* Add files via upload

* Add files via upload
2023-03-11 11:03:29 +00:00
RyverStyx
4f17ccef57 Removes Non-Fed Citizenships for Skrell Federation Origin Selection (#15970)
* Removes all Non-Fed citizenship options

* Create fedcit.yml
2023-03-11 11:03:23 +00:00
kyres1
681abce496 Offworlder loadout/webbing resprite (#15976)
* wrapping up

* adding that bugfix to the changelog
2023-03-11 11:02:33 +00:00
SleepyGemmy
b1b91f7f5f Tweaks Some Recipes (#15982)
* Tweaks Some Recipes

* CL

* Fixes Corn Dog Recipe

* Döner Kebab

* CL
2023-03-11 11:02:21 +00:00
Alberyk
478ee38514 Fixes being able to dismantle exoplanet turfs (#15995)
* Exoplanet turfs fix

* Fixes for real
2023-03-11 00:05:36 +00:00
Wildkins
b74cefd1f5 Fix a bunch of hostile mob problems (#15994)
* Fix a bunch of hostile mob problems

* fix

* can't be That Generic
2023-03-10 13:54:18 +00:00
Alberyk
8b686d5bc1 tesla body tweak (#15972) 2023-03-09 22:46:07 +00:00
SleepyGemmy
a6bf77de24 Examine Message Order Tweaks (#15954) 2023-03-08 17:27:39 +00:00
mikomyazaki
af62fa18e8 Restores icon for the mobility module (#15974)
* Restores icon for the mobility module.

* Points to signs.dmi instead

---------

Co-authored-by: Andrew Cooper <mikomyazaki@gmail.com>
2023-03-08 03:06:10 +00:00
Alberyk
0c05490891 The End of the World: the Adhomai North Pole (#15905)
* The end of the world as they know it

* The horrors are here

* changelog

* conflict fix
2023-03-07 22:25:53 +00:00
Alberyk
3392da8f54 Adds woodcutting mechanics (#15906)
* we out there cutting

* Fix

* changelog

* more wood cutting

* stump

* cool icons

* suggestions

* the log
2023-03-07 17:20:14 +00:00
Sniblet
4e670d9759 Vaurcae aren't slowed by cold (#15944)
* the pr

let's see how this goes wrong

* breeders and warforms too
2023-03-07 01:17:48 +00:00
Sniblet
8febcc10f5 Makes Techno resurrect work (#15840)
* Update resurrect.dm

you cant just make a dead guy conscious in brainmed

* changelog+removed redundancy

* removed client check (for testing), removed surgery check for spells (probably good to stay)

* Update resurrect.dm

* Update Sniblet-resurrect.yml

* Update resurrect.dm

* only heals when successful

* only healing spells bypass surgery safety

* Update Sniblet-resurrect.yml
2023-03-06 13:10:36 +00:00