925 Commits
Author SHA1 Message Date
Wowzewow (Wezzy)andGitHub 186e3a9547 Assorted Bug Fixes (#17399) 2023-09-22 20:10:02 +00:00
462115b501 The Pumped Up Kicks Update (#16265)
* The Pumped Up Kicks Update

Shoes. New shoes. Look at them.

* WELCOME TO THE UNDERGROUND

* for the love of crust

* turns out a var already existed for that but was never implemented ffs

* face it you're never going to make it

* these are winter boots

* removes Paradox's Thinly Veiled Fetish

* shiit

* Apply suggestions from code review

* Update code/modules/clothing/shoes/oxfords.dm

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

* oops

* fuck this file

* nice balls, bro

* check out how hard i can pee

* pissing on the moon

* caligaeae

* pee pee poo poo man

* fixes

* damn you

* merge fixes

* knees more

* damn you merge conflict

* fix

* fixes 2

* riding boots

* truly, this fixes things

* dammit ctrl s

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-13 11:29:03 +00:00
ce5ac79e3c Split examine verb and function, and improve it (#17251)
* Split examine verb and function, and include adjacency and distance checking in examine function

* Fix various issues

* Update code/modules/mob/examinations.dm

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

* Add required define vars

* Update code/game/objects/items/stacks/wrap.dm

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

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-09 08:07:36 +00:00
Cody BrittainandGitHub 69fbefa17c Added a uniform for Einstein Engines (#17202)
* Added a uniform for Einstein Engines

* Fix indenting
2023-09-07 20:45:18 +00:00
Wowzewow (Wezzy)andGitHub d469e93fc3 3/4 reagent container sprite and cafe tweaks and fixes (#17259) 2023-09-07 14:49:00 +00:00
cc8eab09ef Reagent Containers : The 3/4thening & Contained Spritening (and other related food things) (#17231)
* food and drink

* sabrage

* kanpai and blasted on grain alcohol

* beakers

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

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

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

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

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

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

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

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

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

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

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

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

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

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

* changelog

* the contained sprite-ening....

* deletes old file

* teapot

* aaaaahhhh

* AAAGH INHANDS

* volume = 30

* fixes invalid icon state

* is this really that fucking esoteric

* Revert "is this really that fucking esoteric"

This reverts commit 5b238c7821.

* this should fix it maybe

* fixes 2

* the simple solution

* skibidi toilet

* god dammit

* jyalra

* redundancy

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-09-06 18:54:20 +00:00
Cody BrittainandGitHub 9a6edb999f Cleanup and expand suppressors (#17173)
* Cleanup and expand suppressors

Suicide uses suppressed sounds too

Fix CL

Added the suppressor to the antagonist uplink

Fix CL escape characters

Fix random list

Resolve issues from code review

Split the suppressor into its own file

* Bayonets and ammo displays now add their weight to their attached weapon

* Balloon alerts for weapon mods

* Fix lint
2023-09-04 08:22:14 +00:00
RustingWithYouandGitHub 2fa70f8f8e repaths hegemony rifle (#17051) 2023-09-01 18:10:34 +00:00
SparkyandGitHub ab35049d18 Cowboy hat fix (#17207)
* Frontier Cowboy Hat Fix

Fixes the cowboy hats in the Frontier Cowboy crates being white. They are now brown instead.

* Change brown

* Colour defines
2023-09-01 17:55:41 +00:00
Cody BrittainandGitHub 8c2c1c08f1 Frontier Cowboys now receive a lever action rifle (#17156)
* Frontier Cowboys now receive a level action rifle

* Icon and sounds for the Lever Action

* CL

* Attribution

* Added updated sprites by suethecake

* Ensure internal consistency
2023-08-30 22:36:52 +00:00
+2 99b4033ca5 Aurora 2: The 3/4thening (#17186)
* after dark

* FIXES

* breakin

* butt

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

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

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

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

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

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

* testing 1

* a

* FUCK THIS PRESET!!!

* allah

* OTEMACHI

* tis' done

* Project Exorcism : Sneed's Snairs (Formerly Chuck's)

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

* Update stools.dm

* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm

* Update code/game/objects/structures/stool_bed_chair_nest/stools.dm

* Update stools.dm

* Update chairs.dm

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

* inhand fixes

* airlocks (matt has cooked)

fuck

* my cody plays the mamba

* fuck

* fixes layering issue

* airlocks and everything else Please fucking kill me

* underlays

* unfuck blending

* finished replacing old ass shit

* your ass is geass

* conflicts die now

* public fat'wa

* progress on walls and windows

* more mapping

* baltimore accents be like

* minor progress

* monitors

* fire alarms and apc adjustments

* apcs pixel adjustments, final airlock look

* also grilles

* shuttle wall start plus shuttle windows

* starting consoles

* table outlines

* I love broke ass sprites

* fixing the stupid ass exterior walls

* light fuckery

* terminal directionals, external airlocks, table fixes, blahblahblah

* fix 1

* fix 2

* some more fixes

* fix chairs

* basic untested railings and updating colors from atteria

* bridge and some fixes

* removing some artifacts on the new walls

* breaking wood tables and adding 4 wall materials

* fix

* compile & wood fixes

* make the horizon compile again

* railings, firedoors, ATMs, intercomms and tables again

* mapping begins also some tweaks to map view of icons

* full tile steel walls

* i sure hope nothing bad happens

* airlock updates (untested)

* reverts most wall machinery

* skull

* wall coloring

* makes the tg wood chill out

* work on airlocks

* hull consistency

* cause you live forever in the lights you make

* whoops can't show that in a christian manga

* terminals should be on walls and everything's hunky dory now

also i changed the wood stuff as per atteria's suggestion

* fixing airlocks

* fixes

* window resprite, coloring adjustments

* scc hull resprite

* new grilles, frame edits, and borosilicate

* greyscale wood palette improvement

* shuttle windows

* window frame fix

* apc update

* refit and reshaded fire alarms

* mapping icon fixes

* table fixes

* map fixes, platforms and stairs

* updates cutter, new walls and terminals

* mapping fixes

* fix preview

* preview fix stone

* stairs

* initial work for the map

* railing and windowpane fuckery

* new external airlocks

* a

* fix the maps in preparation

* wall object pixel offsets

* air alarms D1

* extinguisher cabinets

* APC DESTROYED MISSION ACCOMPLISHED GOOD WORK

* deck 3: floor decals, APCs, air alarms, fire extinguisher cabinets

* deck 3: fireaxe cabinet

* /shuttle_landmark/distress/blue, move base_turf from map to obj def

* intercom presets

* formatting

* deck 1: floor decals

* deck 2: named area fix (LMAO), signs to use single quotes

* deck 2: floor decals, APCs, air alarms, fire extinguisher cabinets, fireaxe cabinets

* Platforms and stairs!

* grates and bugfixes

* Angled ship walls + grate color fix

* corrects apc anim overlay

* deck 2 and away site fixes

# Conflicts:
#	maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

* deck 2 missing grate

* warning stripes

* railings and ledges

* windows and fixtures

* windoorsagain

* airlocks pt1

* windows de-seamed and transparent

* airlocks and pixel offsets

* fixes for airlocks

* more airlock fixes

* presets for ringer, request console and newscaster

* 132

* asfsaf

* kitchen tiling

* thicker freezer tile bevels

* More angled walls

* New shutters and blast doors

* directional corrections

* ops railing fixes

* updated window map things and shutters

* value changes and blast door changes

* Ledges and platforms galore (D2/D3)

* all decks: fix door dirs

* all decks: newscasters, intercoms, requests consoles, ringer consoles

* helm light blue decals to dark blue

* supermatter door dir fix

* fix directional presets (dirs/offsets): newscaster, intercom, requests console, ringer console

* firedoor changes

* deck 3: overlapping wall mountables fixes

* map changes

* airlock changes

* map tweaks

* airlock & stair icons

* various mapping modifications

* Double airlocks + fixing denied states + fixing airlocks on all levels

* Rebase

* directional terminals buttons and lights again, platform tweaks

terminal north facing sprites, atm/food terminal directionals
proper door control and lightswitch directionals (presets still need to be set up, mapping)
re-adds new light tube sprites, again
new sprites for floor lights and the other stuff that got added
adjusted platforms to be recolorable, added light and dark versions, fixed some shading

* missing ERT outfit thingy fix

* floor lights fixed

* deck 3: various small fixes

* deck 1: various small fixes

* deck 2: various small fixes

* fixes

* d2 fixes & multitile door fix

* d2 fixes, remove unused airlock files, button icon fixes, window icon fixes

* make it actually compile, oops!

* make it actually compile, pt2

* CE office camera

* pew pew pew

* pew pew pew 2

* fixes

* deck 3: buttons fixes

* deck 3: button and other fixes

* deck 3: fixes and stuff

* D1 fixes & skrell airlocks

* minor D2 tweaks

* a lot of airlock-related fixes, glass tables, paint sprayer fixes, decal fixes, changelog

* maintenance hatch sprites

* fixing double doors

* flips multi-tiles, fixes multi-tiles, adds desk windoors

* new plastic flaps

* deck 2: a few buttons

* side + middle doors

* created paths for 3-tiles doors

* apply to map the 3 tiles airlocks

* some fixes, windoor alpha

* remove this random ass potted plant

* more map fixes

* holodeck disposal pipe fix

* secure airlock sprites

no code or obj definitions yet

* vault airlock

* vault door fixes

* scc window alpha

* adjusts double door glass, firedoor open state

* adjusts construction states for doors

* remove some defunct icons and fix anims

* assembly stuff

* pharma fixes

* vault door dir

* firedoor smart generation moved to its own proc

* lift doors, d1 fixes

* firedoor smart generation: adjacent wall check

* firedoor smart generation: adjacent firedoor check

* all decks: missing firedoor and other fixes

* deck 2: weird maint stairs fix

* oops

* diona airlock fix

* the shuttle wall gigadeath

* fixes

* some fixes for leftover map item paths, and double lattices

* new diona walls

* more fixes

* and more

* deck 1: fix out of bounds keys

* deck 3: fix out of bounds keys

* runtime 3: duplicate APCs fix

* all decks: make all 3 tile wide doors glass

---------

Co-authored-by: Wezzy <wowzewow@gmail.com>
Co-authored-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
Co-authored-by: kyres1 <noodle.buster31@gmail.com>
Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: atteria <tarkona@protonmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Co-authored-by: naut <nautilussplat@gmail.com>
Co-authored-by: naut <55491249+nauticall@users.noreply.github.com>
2023-08-30 21:18:10 +00:00
f508441aae Adds Xeno Corporate Voidsuit Sprites & Modkits (#17094)
* sprites

* drip 2: frog version

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

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

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

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

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

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

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

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

* Update code/modules/clothing/spacesuits/void/misc.dm

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

* Punctuation

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-08-20 14:14:54 +00:00
Cody BrittainandGitHub 4a78086659 Reduces the cost of the Frontier Cowboys gear loadout crate from 10 to 5 (Group from 35 to 15) (#17084) 2023-08-19 20:46:46 +00:00
RustingWithYouandGitHub 36481ec455 New Pirate Voidsuits & Tarwa Fixes (#16999)
* fixes tarwa suit

* new pirate suits + antag crate tweaks
2023-08-08 00:22:19 +00:00
OolongCowandGitHub 50f70fefd3 adds white webbings to medical lockers (#16975) 2023-08-04 14:30:01 +00:00
DoxxmedearlyandGitHub 1874ac2602 Fixes drones unable to use closet toggle open (#16956) 2023-08-01 11:24:00 +00:00
DreamySkrellGitHubDreamySkrell <>
cc41bb76fc Idris cafe (#16884)
* freezer, teal decals

* mappin

* a

* cafesign

* a

* coffeemenu

* pumpkinspice

* coffeemenu

* pspice in condi box

* mapping

* a

* a

* a

* takeaway cup

* chocolate syrup

* mappp

* table

* syrup icon

* syrup reagentfillings icon

* takeaway cup volume

* syrup bottles

* freez

* condiment box

* map

* c

* a

* firealarm

* oops

* Update DreamySkrell-idris-cafe-0.yml

* post merge fix?

---------

Co-authored-by: DreamySkrell <>
2023-07-30 18:31:18 +00:00
RustingWithYouandGitHub 5ba5a8346f Unathi & Tajara Gear Crates (#16807)
* unathi gear crates

* dpra bc why not

* tweaks to rifles in dpra crate
2023-07-24 21:17:25 +00:00
DreamySkrellGitHubDreamySkrell <>
2a64e17d6a Abandoned industrial station (#16677)
* init

* map work

* mappin

* map

* random/tool(box)/icon_state fix

* mappin

* a

* b

* aa

* trashbin filled

* boozeomat/abandoned

* foodheater/abandoned

* areas

* map

* areas etc

* a

* a

* a

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* light

* a

* b

* a?

* aaaaaaaa

* changelog

* broken light, off lamp

* madness

* a

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* a

* uhhh

* I am becoming insane

* hangars, how do they work?

* lattices

* light/spot/weak begone

* game note

---------

Co-authored-by: DreamySkrell <>
2023-07-23 22:40:00 +00:00
DoxxmedearlyandGitHub 70a4a50920 Fixes doubling up on bodybags (#16785)
* Fixes doubling up on bodybags

* Feedback edits
2023-07-21 19:35:09 +00:00
bdf6d87286 Removes fragmentation ammo from the sec armory (#16681)
* removes the stuff

* Update code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm

---------

Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-07-15 10:10:56 +00:00
DoxxmedearlyandGitHub d8809e3cba Simple mobs no longer one-shot structures (#16709) 2023-07-13 04:23:32 +00:00
OolongCowandGitHub 414bc0d24d Anesthetic Closets now contain oxygen tanks by default (#16670)
* yeah

yeah

* deletes handplaced oxygen tanks
2023-07-12 10:44:33 +00:00
FluffyandGitHub 5e1332d60f OpenDream linting (#16468)
* I wanna set the universe on fire

* dfsaaf

* setup

* dir issue?

* dsf

* Perhaps the script

* saf

* cry

* pain

* sdfas

* Try reintroduction of tag-matcher

* Failed

* Tries to suppress dotnet compile warnings

* Like this maybe?

* woopsie

* Damn pathings

* Hate

* Pragmas

* unlint?

* Maybe?

* GDI

* Redundant ifdef removed and changelog

* Did I forgot the tag matcher, or it was still broken?

* Yea no that script is still broken

* Removed tag-matcher as requested

* *sigh*

* test

* bro what?

* hope

* just fixing the input

* Let's see if we catch it...
2023-06-26 17:05:38 +02:00
79b8d5e471 sneed (#16493)
Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-06-22 21:23:19 +00:00
CampinKiller24andGitHub c48bed0b9d adds it (#16472) 2023-06-22 21:23:05 +00:00
261518b3f7 awd (#16479)
Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
2023-06-19 10:00:06 +00:00
316a80c231 Splits telecrystals into bluecrystals and telecrystals. (#16380)
* bluecrystals 1

* Splits telecrystals into bluecrystals and telecrystals.

* fixes

* dans ma tete ce n'est pas evident

* c'est toujours trop beau pour etre vrai

* on ne peut toucher le ciel des doigts

* thanks lily

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-06-18 12:43:49 +00:00
GeevesandGitHub 391a9043ec PEAC Stuff (#16274) 2023-06-09 10:09:45 +00:00
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
harryobandGitHub 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
cb2a9be179 Adds Hat to BC locker (#16256)
hat time

Co-authored-by: Nate <n8toepotato@gmail.com>
2023-04-29 09:29:12 +00:00
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
SleepyGemmyandGitHub 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
OddHerringandGitHub 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 MarieandGitHub 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
Cody BrittainandGitHub 6b79228f81 Added a TCFL gear crate, and revamped the Dominia crate (#15920)
* Added Tau Ceti Foreign Legion crates (group and single) to the uplink

* Revamp the Dominian gear crate to include their new faction items

* CL

* Added Dominia voidsman modkits

* CL update

* Replaced the blaster pistols, with two each of the blaster carbines and gauss guns based on feedback from discord.
2023-03-06 13:09:58 +00:00
fd65cec7ef Adds Einstein Merc Equipment (Again) (#15799)
* Adds Einstein Merc Equipment

Adds two gear crates for mercenary teams (or an individual) looking to play as Einstein Engines.

The group crate contains two energy rifles, and a heavy bolter. The single crate has one energy rifle. Both come with silenced pistols and themed voidsuits (or a hardsuit in the case of the group crate)

* Minor Syntax Fixes

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-03-01 17:57:55 +01:00
AlberykandGitHub 2e83b8e34c Adds the ha'rron (#15796) 2023-02-16 09:01:20 -03:00
Wowzewow (Wezzy)andGitHub 7af3db8939 Uniform QOL (#15781) 2023-02-14 21:59:33 +01:00
Wowzewow (Wezzy)andGitHub 12ddd59fa9 Adds Medpouches (and other Bay Stuff) (#15505) 2023-02-08 11:27:55 +01:00
Matt AtlasandGitHub 31c73ead85 Ports the radiation subsystem and cleans up damage flags. (#15715) 2023-02-07 13:22:47 +01:00
SleepyGemmyandGitHub de47686ec0 Overalls and Shorts Tweaks (#14987) 2023-02-02 15:01:19 -03:00
AlberykandGitHub ff229569ae Under the Twin Suns: the S'rand'marr Sector (#15295) 2023-02-02 14:51:06 -03:00
dd482c63af Update the codebase to 515. (#15553)
* Update the codebase to 515.

* edit that

* WHOOPS

* maor

* maybe works

* libcall and shit

* do that too

* remove that

* auxtools isnt updated so get rid of it

* actually remove auxtools lol

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-01-23 21:21:37 +01:00
SleepyGemmyandGitHub ce0076aba6 Security and Brig QoL Tweaks (#15434)
*
2023-01-21 12:45:21 +01:00
Matt AtlasandGitHub 25fd3ba098 Stops shuttles from bringing background turfs with them. (#15580) 2023-01-20 14:52:01 +01:00
FluffyandGitHub 04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt AtlasandGitHub b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
FluffyandGitHub 0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00