Commit Graph

187 Commits

Author SHA1 Message Date
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
Geeves
8163dfaa1f Simple Mob Surroundings Damage (#16339) 2023-05-27 09:26:20 +00:00
Fluffy
32d83f56df Pain (#16088) 2023-03-24 21:35:07 +00:00
Matt Atlas
31c73ead85 Ports the radiation subsystem and cleans up damage flags. (#15715) 2023-02-07 13:22:47 +01:00
SleepyGemmy
ce0076aba6 Security and Brig QoL Tweaks (#15434)
*
2023-01-21 12:45:21 +01:00
Matt Atlas
25fd3ba098 Stops shuttles from bringing background turfs with them. (#15580) 2023-01-20 14:52:01 +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
Geeves
252436ae4d Genetic Skeletonization & Mutation Refactor (#15293) 2022-12-18 20:23:43 +01:00
Matt Atlas
4db452cfa8 Makes being thrown into airlocks/doors/machines hurt, mobs can now be thrown over railings. (#15054)
* Makes being thrown into airlocks/doors/machines hurt, mobs can now be thrown over railings.

* Apply suggestions from code review

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

* Update code/game/machinery/machinery.dm

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

Co-authored-by: Matt Atlas <liermattia@gmail.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2022-11-11 01:51:40 +01:00
Matt Atlas
65cece06b7 Adds a ship to ship combat system and weapons for the Horizon. (#14851) 2022-11-05 20:11:16 +01:00
Jaraci
a527c73f6e Broken windows now drop all their materials when shattered (#14861) 2022-10-25 12:03:01 +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
SleepyGemmy
09fea6902c Fixes Windows and Window Frames on Centcomm Not Smoothing (#14416) 2022-07-11 12:18:04 +02:00
SleepyGemmy
005f30b76f Window Rework (#13805) 2022-07-05 14:27:29 +02:00
Wildkins
fc2a99f1a8 Explosion Performance (#13988) 2022-05-17 18:11:40 +02:00
Wildkins
a4461a17af Implement Bay's SSmachinery and power usage updates, further unclogging the toilet (#13910) 2022-05-16 18:50:16 +02:00
alberyk
3f86f85675 announcement fixes 2022-01-30 20:42:56 -03:00
alberyk
4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff
# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
2021-12-21 16:51:40 -03:00
Geeves
aec7d4748f Full Window Blending (#12732)
* Full Window Blending

* cl

* last bits

* phoron windows

Co-authored-by: Werner <1331699+Arrow768@users.noreply.github.com>
2021-12-19 22:10:34 +01:00
Werner
ae58ffe264 Away Mission Events (#12802) 2021-12-04 02:23:24 +01:00
alberyk
b37dfdcb96 shuttle stuff 2021-09-24 18:33:32 -03:00
alberyk
807769071b Merge branch 'master' into medbay_fixes_and_shit 2021-09-22 22:29:51 -03:00
Alberyk
6ea66b23f6 Adds new full windows (#12434) 2021-09-17 12:36:40 +02:00
Alberyk
e58c807b8c jobs 2021-09-02 15:13:08 -03:00
Alberyk
3055addda2 icon fix again 2021-08-26 21:15:17 -03:00
Alberyk
2d24fc47fa fix window placeholder 2021-08-26 21:14:41 -03:00
Alberyk
6810632cd8 wall unfucking 2021-08-22 12:47:20 -03:00
Alberyk
f5548eb5e3 Merge branch 'master' into updates_stuff
# Conflicts:
#	code/game/objects/structures/window.dm
2021-08-04 23:08:28 -03:00
Alberyk
48adf7f5cf New scc shuttle walls and windows (#12284) 2021-08-04 16:21:40 -03:00
Ferner
2307beaff6 Merge branch 'master' into placeholder 2021-02-17 06:12:13 +01:00
Matt Atlas
c30cd94024 Reworks armor damage reduction + armor components + more goodies. (#11106)
Ports Baystation12/Baystation12#27254 and Baystation12/Baystation12#24787 and everything inbetween I guess.

Note that this PR makes guns and armor overall stronger. Lasers also once again do organ damage.
2021-02-14 17:54:45 +02:00
Ferner
e873b3ce67 Placeholder windows 2021-02-08 15:14:02 +01:00
Wowzewow (Wezzy)
31e5669f22 New button sprites (#10820) 2020-12-22 01:54:34 -03:00
Wowzewow (Wezzy)
307c214541 makes w_class use defines (#9848) 2020-09-06 17:37:56 -03:00
Matt Atlas
0dd08df5b2 Refactors sound groups to use decls instead of a massive switch with dozens of global lists. (#9702) 2020-08-28 20:47:00 +02:00
Wowzewow (Wezzy)
7114d3525f More new sounds and fixes equip sounds (#9464) 2020-08-12 11:17:39 +02:00
Geeves
33ad8096fb The Great Spanning (#9320)
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
2020-07-12 15:53:28 +03:00
Matt Atlas
c6d9cba325 Changes up a lot more messages to look like emotes. (#9133) 2020-06-18 10:29:47 +02:00
Matt Atlas
71fc63d2c7 Fixes an air damage runtime and whisper verb printing (#9110) 2020-06-13 11:50:41 +02:00
Geeves
482b749ff4 Misc Attack Message Fixes (#8532)
You can now put flags on windows without bashing them.
    Compartmental circuit kits no longer display pickup error messages when you put it back in the big box.
2020-03-29 12:28:39 +03:00
Matt Atlas
72c968eba6 Genericises rotate() on objects. (#8430) 2020-03-17 17:17:42 +01:00
mikomyazaki
21f348ec57 Adds a unit test to check for any missing initial icon states (#8332) 2020-02-23 02:43:12 -03:00
fernerr
d13a6058ec Remaps the Srom, adds a bunch of map assets that were used during the skrell arc (#8175) 2020-02-10 17:43:54 +01:00
Wowzewow (Wezzy)
48e4227b24 adds new window cracking and message formatting (#8132)
also adds some consistency of glass sound naming schemes
and any glassbreak noises properly uses the list now in sound.dm
2020-02-02 13:12:46 +01:00
NonQueueingMatt
d70c6824b7 Fixes Pun Pun causing runtimes by knocking on windows. 2020-01-07 15:00:16 +01:00
Matt Atlas
c087a0a0bf Ports a psionic system from Bay. (#7717)
* Ports a psionic system from Bay.

* Rip out this shitcode.

* shitcoden't

* fixes

* it should work fully now

* Admin fixes

* Remove todos

* remove todos part 2

* Removes psi-armour. We don't need this for now.

* Skrell are now operants. Tweaks coercion.

* Adds thralls.

* Temp removal of psiarmour. Fixes psigrabs.

* Thrall assay.

* fixes

* More fixes

* unused define cleanup

* Log and powers

* Skrell powers are done.

* Update code/modules/psionics/events/mini_spasm.dm

Co-Authored-By: Geeves <ggrobler447@gmail.com>

* Update code/modules/psionics/events/mini_spasm.dm

Co-Authored-By: Geeves <ggrobler447@gmail.com>

* Update code/modules/psionics/equipment/cerebro_enhancers.dm

* did this work???

* jargon

* arrow's fixes

Co-authored-by: Geeves <ggrobler447@gmail.com>
2019-12-24 11:32:05 +01:00
Werner
cb4a712851 Enforces Lineendings and adds Editorconfig (#7657) 2019-12-21 16:19:24 +01:00
fernerr
aa2e02c1a6 Shuttle update: Part Two: The Legion Protects (#7457) 2019-11-23 18:50:19 +01:00