Commit Graph

1948 Commits

Author SHA1 Message Date
Joshie
88e4aeb91f Fix and Changelog (#18042) 2023-12-22 21:24:37 +00:00
Geeves
d7db1f6d4a Orion Express Courier System (#17952)
* Orion Express Courier System

* tweaks and fixes

* whoops this goes in the back

* cement das conk creet baybee

* while funny, fixed supplies count

* add support for non-overmap tests

* guh

* anotha one

* feedback

* remove unused imports
2023-12-19 11:45:39 +00:00
DreamySkrell
ae3bf5f331 SCC Scout Ship (#17826)
* scout ship stuff

* stuff

* work

* xyz

* all roles

* things

* mappin

* things

* Revert "things"

This reverts commit ca4006f1c8.

* thingz

* ay

* xyz

* spawner

* a

* H

* holy hell

* huh

* m

* 6

* a

* o

* 9

* 8

* o

* o

* xd

* 5

* 2

* 999

* areas

* 7

* a

* 134

* 12

* o

* random.dmi

* 87

* a

* s

* u

* 5

* 7

* 6547

* ,

* 2534

* ghostspawner

* 2

* 5

* 6

---------

Co-authored-by: DreamySkrell <>
2023-12-18 12:27:09 +00:00
RustingWithYou
bc66a212d7 Hephaestus Security Ship & Corporate Voidsuit Tweaks (#17962)
* hephaestus security ship

* fuck off

* welcome mesgaes

* lattice hell

* damn you kaizr

* cabinet
2023-12-18 11:36:32 +00:00
Sparky
1fdf2c750c Hammertail Gear (#17960)
* Hammertail Gear

Adds a Hammertail Smiths jumsuit, as well as adding themed gear crates to the uplink.

* Fix?

* Fix again

* Forgot to rename uplink

* Missing space

* Group Gear Looped

As requested
2023-12-17 21:44:52 +00:00
RustingWithYou
bbe473de83 Scarab Salvage Ship (#17857)
* map

* byeah

* i fucking love scarabs bro i fucking hate gravity

* decals

* cl

* ship fluff

* L

* flags

* docks, wider catwalks

* airlocks

* sectors

* bedroom & armory swap

* ghuh

* entry points

* flag

* ghuh

* hguh

* more claustrophobia, more gaming

* alarme

* love me doors

* a single fucking lattice

* fleg

* great grate mate

* uhhhh

* aaaa

* fixes & changes

* sschpasche

* h
2023-12-15 17:08:54 +00:00
Fluffy
22a6057a2e sfas (#17938) 2023-12-13 19:03:06 +00:00
Fluffy
123aa0699f sfsa (#17933) 2023-12-12 16:37:40 +00:00
Fluffy
bed6bc3d73 Improve scrubbers (#17892)
* sd

* unrelated bug i found

* fafsd
2023-12-09 21:28:52 +00:00
feartheblackout
d009186069 Adds Galatean flags & banners (#17886) 2023-12-09 12:26:42 +00:00
Fluffy
c4f5dc06e7 sdaf (#17910) 2023-12-09 12:26:08 +00:00
Avery Marie
c56041e87e SCC Energy Pistol (#17854)
* First Test

* fixes projectile type

* Gun works!

* blah

* testin

* SCC Energy Pistol

* Tweaks Damage

* Removes the random map change, sorry.

* Removes the turret confusion

* Updates the changelog to be more specific

* Forgot to delete this

* Gun dmi changed

* fixes some code
2023-12-06 18:46:48 +00:00
Wowzewow (Wezzy)
5ad3c00da2 A Reasonable Suit Sensor Rebalance (#17607)
* A Reasonable Suit Sensor Rebalance

* discombobulate

* weird ahh

* HAPPY WHEELS

* SQL

* this will work hopefully

* damn me dumb

* please work

* Apply suggestions from code review

* Rename V004_suit_sensors.sql to V004__suit_sensors.sql

* remove sensor lock

* dmdocs + fixes

* Update code/modules/clothing/under/jobs/civilian.dm

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

* Update SQL/migrate-2023/V004__suit_sensors.sql

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

* Update code/modules/clothing/clothing.dm

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

* Update code/modules/clothing/clothing.dm

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

* Update code/modules/clothing/clothing.dm

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

* Update code/modules/clothing/clothing.dm

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

* Update code/modules/clothing/clothing.dm

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

* changes

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
2023-12-06 18:41:46 +00:00
Fluffy
eecb69f8f8 sfa (#17871) 2023-12-05 11:40:11 +00:00
Fluffy
d8d063edc6 EMP Refactor & Multi Z-level EMPs (#17781)
* sdfasf

* sdfas

* dsf
2023-12-04 19:37:49 +00:00
CampinKiller24
35e79d4656 Adds the Elyran Flags (#17852)
* flag on the play

* more description here

* Update flags.dmi

fix minor offset oops
2023-12-04 18:15:59 +00:00
Geeves
8db403e4eb Void Identification Stuff (#17773)
* Void Identification Stuff

* add to crew armory
2023-11-27 00:49:38 +00:00
Cody Brittain
06601c9ec3 Split up and rename var/flags (#17794)
* Split up and rename `var/flags`

* Various fixes

* CL

* Don't rename Phoron Guard phoron preset

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-11-22 16:27:51 +00:00
Pirouette
8041bfa1d3 Adds Lunan flag sprites (#17682)
* Adds Lunan flag sprites

* Update accent_tags.dmi

* Update lunanflag.yml
2023-11-13 20:23:52 +00:00
Matt Atlas
37e489cb96 Revert "Changes + Changelog (#17653)" (#17689)
This reverts commit e0272bbf54.
2023-10-27 16:46:44 +00:00
Joshie
e0272bbf54 Changes + Changelog (#17653) 2023-10-26 14:19:04 +00:00
Wowzewow (Wezzy)
8332ab1343 21/10/23 Bugfixes (#17648) 2023-10-22 12:36:19 +00:00
Cody Brittain
5584baa019 Added a flag and banner for the All-Xanu Republic (#17609)
Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-19 18:36:08 +00:00
Fluffy
3f65f0625e woopsie daisy (#17584) 2023-10-13 08:01:04 +00:00
Wowzewow (Wezzy)
86084d490e 3/4 Update : Chair and Table Loose ends and fixes (#17571)
* 3/4 Update : Chair and Table Loose ends and fixes

* black carpet affair

* damn you golden deep

* Update code/modules/tables/flipping.dm

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

* Update code/modules/tables/flipping.dm

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

* yes

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-10-12 21:36:42 +00:00
Matt Atlas
54dc8a0860 Adds TGUI say and TGUI input. (#17471)
* i alone am the honoured one

* THROUGHOUT HEAVEN AND EARTH I ALONE AM THE HONOURED ONE

* hollow point

* nanana

* ssss

* tgsay final touches

* stuff

* tgui inputs

* help

* carpal tunnel syndrome

* ffff

* again and again and again and again

* hehehehe

* dsada

* readd sanitize

* whoops

* dsad

* nah fuck that

* sd

* fix

* ow

* remove prefs for testmerging

* oops

* oops 2

* fix that

* f

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-11 23:26:59 +02:00
Fluffy
741c0b65e0 Flags fix overlooked addition (#17559)
* Atomization

* asfas

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-10 12:13:28 +00:00
Fluffy
139624aa25 Flags fix and minor refactor (#17543)
* Atomization

* afsd

---------

Co-authored-by: FluffyGhost <FluffyGhost>
2023-10-08 21:32:50 +00:00
Cody Brittain
6fc69c56c2 Added old and antique Biesel flags (#17170)
* Added old and antique Biesel flags

Update lore desc to make clear, that displaying something that is a direct threat to the SCC is a -very- bad move.

* Add the antique flag to the loadout

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-06 09:23:07 +00:00
CampinKiller24
cea8ca8d9a Adds Stinger Grenades (#17474)
* balls

* lint this

* lint deez

* le change

* Update stinger.dm

* i am going to murder the new linter

* sprite

* Update CampinKiller24-ready-or-not.yml
2023-10-05 10:16:21 +00:00
Fluffy
4538e2a7cc Fix indentations (#17481)
* cbt

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* fsadffsda sad

* sadfasd

* jhn

* dsfa

* saf

* safsad

* sda
2023-10-05 10:15:58 +00:00
Cody Brittain
39639e95d7 Added NanoTrasen Corporation gear to the uplink for antagonist usage. (#17153)
* Added NanoTrasen Corporation gear for antagonist usage.

Correct description of hardsuit armor value

* Fix Indents

---------

Co-authored-by: Cody Brittain <cbrittain10@live.com>
2023-10-02 12:39:12 +00:00
Matt Atlas
baeb7c6afd Updates subsystem definitions to new standards. (#17470)
* My heart is dragging me down into...

...oblivion!

* drifting closer to the edge but she won't have me

* ever round me we are dead before we meet her

* for the last time

* wake up in sweat

* n

* fff

* uff

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
2023-10-01 14:24:40 +00:00
Cody Brittain
0a3dac31e0 Refactored do_after to use a flag-based system for options (#17127)
* Refactored do_after to use a flag-based system for options

* More flags

* Ditto

* Use the HAS_FLAG macro

* do_after pass

* Fix burning paper code

* Resolve issues from Fluffy's code reviews

* .
2023-09-27 12:17:14 +00:00
Greenjoe12345
5bccb6ab3e Glass sliding doors for urban maps (#17448)
* doors

* adjustments and fix
2023-09-27 10:26:51 +00:00
Fluffy
870f97c1c7 Icon smoothing subsystem update (#17383)
* sfasdf

* sfsaf

* sadfas

* sdfasdf
2023-09-27 10:23:15 +00:00
Wowzewow (Wezzy)
fd26ff32e2 Fixes Examine Crashes (#17430)
* Fixes Examine Crashes

* fukken indentations
2023-09-27 10:22:04 +00:00
Fluffy
173f73ae27 sfas (#17446) 2023-09-26 18:15:27 +00:00
kyres1
f18d4128ad [WORK IN PROGRESS] Konyang and Point Verdant (#16714)
* starting point verdant

* major progress

* PAIN

* test

* zlevels AAGHHH OH NO

* im scream

* kawnyang

* dam thats good

* Biff Largehuge

* Look Gordon, ropes!

* wawagh

* rgrhgrhrgrh

* Gordon, you're alive! Thank God for that hazard suit.

* help

* frownie face

* wegh

* Gordon! Get away from the beams!

* Good morning, Gordon.

* Signs

* fix multiple proc definition

* initial ambience

* gay rain

* beach and some pebbles literally

* fixing conflicts aUGH

* generation

* guh?

* sewers and beach additions

* maping

* map

* womp womp

* landing zone

* fixing missing shit

* buddha

* ass

* major map updates

* implemented key doors, fixed baloon alert and tasks

* mineral color, adds ozone layer

* real fake walls

* vending subtypes for the regional market

* mooooar

* minimart pt 1

* haneunim skybox

* station mapping progress

* minimart and roboclinic

* offices progress

* bar work

* size change, some polishing of the office + police station

* map size update. Also a fuckton

* tunnels

* more work

* Why doesnt the map initialize

* broke shit

* fixing point verdant spawning, also ocean landing zone

* finishing some buildings

* mapping, village, not finished

* village, main road

* village stuff

* village stuff

* village stuff

* village stuff

* anchoring

* village stuff

* random space tiles fix

* random space tiles fix

* bin fixes

* missing initialize hint on new floors

* fix open space on basement level

* idk

* missing initialize hint

* tests again please

* tests rerun please

* oven/small be gone

* remove shuttle landmarks idk

* bad stairs fix maybe

* fix missing open space above stairs

* tests rerun please

* CircularRandomTurfAround fix

* spaces to tabs

---------

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>
2023-09-23 21:23:38 +02:00
Wowzewow (Wezzy)
186e3a9547 Assorted Bug Fixes (#17399) 2023-09-22 20:10:02 +00:00
Alberyk
57ad3201e0 Tajara loadout expansion: far from home edition (#17270)
* A lot of tajaran stuff

* Changelog

* moved this for better organization

* god fix

* Update code/modules/clothing/rings/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Update code/modules/clothing/under/accessories/xeno/tajara.dm

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

* Flame source

* imrpoper

* passport

* matt fixes

* Fixes conflict

* fixes

* kitchen

---------

Co-authored-by: Cody Brittain <cbrittain10@yahoo.com>
2023-09-21 10:28:15 +00:00
Wowzewow (Wezzy)
1b51600ca6 Kitchen Resprites (#17311)
* Kitchen Resprites

* for ata

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* Update code/modules/cooking/machinery/cooking_machines/container.dm

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

* admiral ackbar cereal

* walter j hartwell

* for real?

* hank schrader

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
2023-09-19 09:58:22 +00:00
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
Cody Brittain
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 Brittain
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)
d469e93fc3 3/4 reagent container sprite and cafe tweaks and fixes (#17259) 2023-09-07 14:49:00 +00:00
Wowzewow (Wezzy)
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 Brittain
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
Fluffy
326ea5cbaf LARP Expansion Pack DLC - Tactical lying down (#15952)
* Initial implementation

* Commented code

* More work for directional handling

* Initial wielding accuracy integration

* Final touchups

* Changelog

* Linter plz

* Alright you prefer this?

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>

* Small fix

* and this too

* Diona now have the icon back, but it's locked to walk and lay down

* Fix buckling direction

* Fucking merge conflicts resolution editor highlighter

---------

Co-authored-by: Matt Atlas <mattiathebest2000@hotmail.it>
2023-09-03 13:48:07 +00:00
RustingWithYou
2fa70f8f8e repaths hegemony rifle (#17051) 2023-09-01 18:10:34 +00:00