This PR does the following.
- Removes Heroin, Cocaine (and it's subtypes), Raskara dust, and all
other Tier-1 drugs in our drug list (excpet from the Cargo reagent
spawner.
- Adds more contraband to the contraband loot table. For example -
- Cocaine, Heroin, 9mm pistol, derringer revolver, sawn off shotgun
(improvised), paralysis pen, and the poison pen. I also added auto
injectors for drugs that are not in pill form, like imprednezene(?),
stimpack, beserk, and nightlife.
- Adds more contraband map spawns in maintenance areas. I believe it
adds 5 or 6 across all three z-levels in areas like the abandoned bar,
the poker table, a table in maintenance by science, the maintenance
under the bar, etc. The map diff bot will show. These are not always
guaranteed to spawn either upon my testing. I'm not sure why, but it
works better this way imo.
- Removes ambrosia and other non-contraband drugs from the loot table
for now.
If requested, I am open to adding one or two custom contraband spawners
for the brig. Just ask in the PR's comments.
---------
Signed-off-by: Avery Marie <98699252+Eyeveri@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Adds several pre-contact Unathi gun designs, some of which currently
accessible through antag gear crates and the Unathi pirate ghost ships.
All gun sprites done by Gecko.
Additionally buffs the generic Unathi armor and Hegemony armor to be
more on par with standard plate carriers instead of just being good at
melee and terrible at everything else, as well as respriting the generic
armor and rewriting flavor text. Armor resprites done by Dronz.
This is part 1 of a project to, eventually, bring the render planes
system from /tg/ and bay into Aurora. This is a prerequisite and blocker
for many things the development team and community want to have, and
this was long overdue.
Many objects have been re-assigned layers, which are now thoroughly
defined. Maps have had their custom layer defines purged, as we should
be moving away from this in favor of saner definitions in the base
items.
This should be a test-merge due to the sheer amount of layers changed,
which will very likely create issues that I cannot possibly discover and
debug in a reasonable amount of time myself.
---------
Co-authored-by: Cody Brittain <cbrittain10@live.com>
* so many theengs!
* Let's commit!
because I haven't in a while!
* final commit fo rnow
* added changelog
* Update TOMIXCOMICS-PR.yml
* ugh
i should've known it was a jinx to refer to a commit as 'final'. bleh.
* added new ramen dish to the ramen vending machine in PV
meant to do that before submitting but had issues with it.
* a
* j
* o
* 21
* we are so back
* i
* o
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
* 447534575478u564u8
* areas
* air alarms
* AIRLOCKS
* a
* h
* c
* cc
* 6
* tests rerun please
* k
* 8
* a
* 756832
* 6845783578
* 85864354632463
* 2
* kills geeves
* a
* tests rerun please
---------
Co-authored-by: DreamySkrell <>
* broke game while working on update, halp
thanks tech support
* Update code/modules/reagents/reagent_containers/food/snacks/soup.dm
Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
* Added more foods, still WIP
* updating things to see where the bgus are coming from
triolade, palfooz and cake pops are lal broken and idk why yet ._. someone said is hould commit changes and see what the checks say.
* trying to fix triolade and palfouz
* code giving trouble
* finally fixed the issues! woo!
* Got almost everything done and working!
only pitas are left :)
* Final update!
-Added a whole lot of recipes
-Fixed a whole lot of bugs
-Fixed V'krexi wraps from a previous update
-Updated some icons
-Let's submit this thing!
* Adding changelog
Woo, changelog!
* Update Tomixcomics-PR-17759.yml
Whoops, missed a typo.
* trying to solve issues
* fixed bug that was causing runtime errors when recipes were made incorrectly. PR should be good to go now.
* Update code/game/objects/items/trash.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/game/objects/items/weapons/storage/fancy.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/cooking/recipes/cultural/recipes_human.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/reagents/reagent_containers/food/sandwich.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* Update code/modules/reagents/reagent_containers/food/snacks/cultural/vaurca.dm
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* small fixes
deleted folder that wasn't supposed to be included (still no clue why it was there lol) and deleted unnecessary annotation
---------
Co-authored-by: Pirouette <57296132+listerla@users.noreply.github.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
* 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
* The Food Sortening, Extra Pain-In-My-Ass Edition
Sorts all food sprites and cuts down the MONOLITH snacks.dm and food.dmi. This was an absolute pain in my ass. No front-facing changes.
Planning to add more shit down the line. Makes everyone's lives easier.
* changelol
* finally
* inhands
* merge conflict
* this really "ticked" me off HAHAHAHAHS
* fixes
* make megalinter happy
* 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>
* 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
* 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>
* 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 <>
* dirty bombs & bodyhorror
* clean up + extra flavour
CE_ANTIEMETIC taken into account in the delayed_vomit() proc. doesn't need to subtract from CE_EMETIC anymore.
* desc. fix, TC tweak, syringe gun kit
* dirty bomb tweaks
radiation remains for as long as advertised (~8mins in an open space)
it also actually leaves behind the green goo now.
* Fix ruin spawning, LZ deletion, UTs and more
* augh
* fix AST exoplanet generation for real
* Fix landing zones turning into rock walls
* fix awaysite runtimes
* im blind
* missed one
* split exoplanet UTs to new UT
* comments
* obj path fixes
* initial commit with placeholders
- adds wulumunusha cigarette variant
- adds federation (tobacco) and traverse (wulu) cigarette packets w/ placeholder names and description
* initial fixes + changes for skrell team
- fixes sprite names
- removes the initial_affect from wulu extract; it's slow-acting, there should be no instantaneously noticeable effect
- traverse cigarettes no longer contain wulu, and instead are now mentholated with dyn
- traverse cigarettes are now added to vendors
- separate wulu cigarette added as a placeholder pending lore decision
* chewing tobacco and brand names
- brand names
- regular and menthol (dyn) chewables added
- added to loadout/vendors
- sprite changes
* descriptions + flavours
- added descriptions given by skrell team
- changed contents to give proper flavour messages
* cl, and wulu flavour description
- adds cl
- changes wulu flavour desc
- restricts diona from selecting the wulu pouch
* fixes
- adds wulu cigarette description
* updates packet descriptions
- short and wide
* pedantic description change
the old description bothered me
* adverbs of frequency go before the verb
* Update code/game/objects/items/weapons/cigs_lighters.dm
erroneous comma
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
* ash-tray to ashtray on all the descriptions whilst we're here
and wulu desc changed by brotendo's request
* Typo Fix
---------
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
* Tweaks the Vault as needed
* Connects the proper disposals
* Oopsies I messed up the Changelog
* f
* For some reason the piping wasn't showing up?
* makes the decals match
* Update html/changelogs/Eyeveri_VaultTweaks.yml
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
* Corrects the Camera tags
---------
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
* 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
