Commit Graph

224 Commits

Author SHA1 Message Date
Wowzewow (Wezzy)
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
Matt Atlas
1343dc97cb Fixes table construction. (#17276)
* Fixes table construction.

* you see yourself a victim?

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-09-08 20:21:17 +00:00
naut
913303549d Post 3/4 Fixes, Pt. 1 (#17195)
* Post 3/4 Fixes

* D2

* more changes
2023-08-31 09:53:12 +00:00
Matt Atlas
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
Cody Brittain
830f409f8a Added floor lighting fixtures, and tweaked the light sprites (#16671)
* Added floor lighting fixtures

* Fix stray pixels in floor tube fixture

* RM railing lights at stargazer

* Remove superfluous light fixtures

* Added Gem's light sprites, created a new sprite for the spotlight, and made spotlights buildable.

* Remove more railing lights

* Fixed up the skrell light fixture sprites

* Made floor lights buildable

* Fixed the burnt and broken spotlight tubes

* New small floor light by atteria
2023-07-12 10:44:25 +00:00
Fluffy
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
kyres1
47a6c01e04 Adds the Canary scout shuttle (#16297)
* scout components

* part 2

* finishing the canary itself

* getting ready

* getting rid of the temporary map

* blRSUGH

* finishing up
2023-05-28 16:17:34 +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
Ramke
369db3a137 Cozy Time Enabler (#15883) 2023-02-25 19:55:21 -03:00
Matt Atlas
9bf39bea97 Fixes some bugs. (#15816)
* Fixes some bugs.

* that too

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-02-14 11:08:14 +01:00
Alberyk
ff229569ae Under the Twin Suns: the S'rand'marr Sector (#15295) 2023-02-02 14:51:06 -03:00
Wowzewow (Wezzy)
b42d489030 Materials And Medical Stacks (#15586) 2023-01-23 20:50:27 +01:00
Fluffy
04d89f212a Singletons + refactor of /datum/observ + refactor of /decl/ into /singleton/ (#15519) 2023-01-10 19:22:14 +01:00
Matt Atlas
b1869884c1 Revert "Singletons + refactor of /datum/observ (#15487)" (#15515) 2023-01-05 19:21:22 +01:00
Fluffy
0ddcf0817a Singletons + refactor of /datum/observ (#15487) 2023-01-05 18:41:40 +01:00
SleepyGemmy
5179dad83e Removes Old Deprecated Stuff (#15241) 2023-01-02 14:27:29 +01:00
WickedCybs
e1ceeecfe2 Two New Away Sites + Extra Tiles and Other Stuff (#14611) 2022-08-23 01:49:39 +02:00
Matt Atlas
f768a9022d Removes ERT from standard gameplay. The Horizon now sends distress beacons for other Overmap vessels instead. Barricades and crew armoury buff. (#14371) 2022-08-02 17:59:51 +02:00
TheDanseMacabre
ed43343dcc Various removals. (#14135) 2022-07-17 22:12:11 +02:00
Matt Atlas
f3dfc58468 Fixes shuttle walls interactions, renames shuttle alloy to plastitanium. (#14400) 2022-07-07 14:02:00 +02:00
SleepyGemmy
005f30b76f Window Rework (#13805) 2022-07-05 14:27:29 +02:00
Wowzewow (Wezzy)
eafa547b5c Ports use_tool proc from /tg/ (#13411) 2022-05-23 14:39:00 +02:00
SleepyGemmy
7387080448 Reworks Portable Generators (#13663) 2022-05-06 13:59:01 +02:00
SleepyGemmy
0ef69c3cb6 Adds Service Airlocks (#13604) 2022-05-02 01:29:39 +02:00
Wowzewow (Wezzy)
a65ef5cd26 The Crate Animatening, A.K.A. I hate Crate Trigonometry (#13339) 2022-04-30 02:04:15 -03:00
alberyk
beecb5f802 Merge branch 'master' into fourth_week_preparation_and_fixes
# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm
2022-02-10 13:36:46 -03:00
Geeves
de1743a1b1 Railing Stuff (#13035) 2022-02-06 18:21:56 -03:00
alberyk
1391c90fa1 shuttles 2022-01-16 15:07:06 -03:00
Wowzewow (Wezzy)
96f1c79d0e Allows painting of padded stools, chairs and beds. (#12855) 2021-12-26 21:12:36 +01:00
Wowzewow (Wezzy)
56c16bf208 Colorable Chairs, Stools, and other phoney baloney (#12797) 2021-12-02 22:57:24 +01:00
Geeves
04b55fb385 Pipegun Buff Again (#12507) 2021-10-30 13:57:51 +02:00
Alberyk
6ea66b23f6 Adds new full windows (#12434) 2021-09-17 12:36:40 +02:00
Geeves
c4b0089749 Synthetic Smörgåsbord (#12417) 2021-09-06 22:47:27 +02:00
Matt Atlas
fb763d64c0 Revert "Pipegun Buff (#12365)" (#12429) 2021-08-31 21:56:36 +02:00
Geeves
6c5e9aa111 Pipegun Buff (#12365) 2021-08-31 18:05:02 +02:00
desven
6eff45c430 Ports paperbags from tg (#12320) 2021-08-25 14:12:57 +02:00
Geeves
dcfd8f7214 Cloth Synths (#12307) 2021-08-19 19:18:15 -03:00
Geeves
b53fa357ed Matriarch Drones (#12275)
* Matriarch Drones

* forgot this
2021-08-05 13:01:50 -03:00
Geeves
98ac4d1933 Easel and Canvas (#12142) 2021-07-21 14:10:43 +02:00
Doxxmedearly
a69fcd5fe6 Animal Hide Updates (#12083)
* Animal Hide Updates

* CL, Fine Hide, and Fixes
2021-06-25 18:57:57 -03:00
Geeves
14ede95a8a Maintenance Chessboard (#11999) 2021-06-08 19:39:54 -03:00
Geeves
0d8128ce1e Sheet Numbers (#11541) 2021-04-19 18:39:02 +02:00
Geeves
dbe0b00838 Shooting Target Refactor (#11186) 2021-04-06 23:13:08 -03:00
Geeves
d0f9c2ed8d i hate merge conflicts (#11383) 2021-03-05 19:42:29 -03:00
Geeves
607fe6680f Chair Build Tweak (#11237) 2021-03-05 18:56:20 -03:00
Geeves
400574a611 Sofa (#11240) 2021-02-27 14:01:54 +01:00
Matt Atlas
cc0171f154 Adds plate carriers, restyles all current station armor to plate carriers, turns arm guards and leg guards into accessories. (#11230) 2021-02-21 15:12:17 +01:00
Geeves
6f0af4cd62 Steel Carving (#11142) 2021-02-15 15:02:33 +01:00
Doxxmedearly
3bfcda228f Curtain and Flap material fix (#10997) 2021-01-23 21:32:36 +01:00
Alberyk
6d362d7706 Add torches (#10838) 2020-12-23 00:56:04 -03:00