Commit Graph
383 Commits
Author SHA1 Message Date
MixityMaxityandGitHub a07c4a9bc9 adds "paved" floors (#32112) 2026-06-25 03:31:02 +00:00
CRUNCHandGitHub f9e1858236 Farragus: Science Polish Pass (#31977)
* Update cerestation.dmm

* Update cerestation.dmm

* new sci maint areas

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm
2026-05-14 22:58:33 +00:00
CRUNCHandGitHub b520bfa03f Update decals.dmi (#31887) 2026-04-28 23:43:22 +00:00
68fb77a19a Wallening 2: Return of the attack of the girders [MDB IGNORE][IDB IGNORE] (#30609)
* WE HAVE LIFTOFF

* Reinforced wall + fixes

* (Reinforced) windows

* Adds nameless plasmaglass sprites

* Plasma windows

* Unnamed cult walls

* Add window edges back

* Wooden walls

* Plasma walls + THANK YOU CHAP

* Oops

* Wooden names

* Cult walls

* Plasma walls

* Uranium walls

* Golden walls

* Silver walls

* False wall basics

* All false walls

* Remove old walls

* Fixes

* First girders

* Build steps

* New floors and decalized floor tiles.

* satisfy linter

* Add command decals, remove old "blue tile" decal

* update script number

* have ATMs put their decals on last

* add engineering decals

* update spritesheets

* lots of tile coloring fixes

* more engi tile fixes

* more tile fixes

* linters

* fixes conflict?

* conflict fixes

* fix layering issue

* cult, necropolis, plastitanium, rocks, backrooms walls

* survival pod walls, prepare for titanium, plastitanium fwall fix

removes diagonal smoothing and the nodiagonal subtype from titanium walls as survival pod walls are a subtype of titanium

* linters

* linters again

* linters number 1 million and counting

* titanium walls

* brass walls, floors, windows

* titanium window, plastitanium window

* brass window smooths with wood and brass walls

* linters number 1 million and one

* all walls smooth with airlocks

in preparation for airlock sprites in a separate PR

* now all walls smooth with airlocks

* windows smooth with airlocks

* separate wallbumps, partially add apc

* tinted window

* survival pod windows

* oops i reverted apc.dm

* mapping fixes

* more mapping sprites

* more mapping stuff, fix my ungodly smooth rocks

* linters

* apc fix

* air alarm, apc, fire alarm offset preparations

* fire alarm implementation + rock fixes + firelock smoothing

* airlocks + supposed map fixes

* engi/atmos airlocks + overlays

* the rest of the doors lol

* linters + freezer fix

* fixes

* shuttle airlock + misc fixes

* firelocks

* fix

* oops

* i need to stop pushing fixes early

* shuttle airlock quickfix

* external airlocks + hatches + fixes

* centcom doors

* highsec airlocks

* vault airlock, double airlocks

* yaya deconflictsies

* lotsa fixes

* light fixes + blastdoor fixes

* firelock gap fix

* light construction fix + rcd fix

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: Alexios <skillpointHD@Gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2026-04-22 14:49:30 +00:00
8aedc66af3 Fixes missing Tranquillite floor damaged texture (#31685)
* adds damaged tranq floor, adds damaged icon state for floorcode

* Adds a singular space

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: MixityMaxity <189351891+MixityMaxity@users.noreply.github.com>

---------

Signed-off-by: MixityMaxity <189351891+MixityMaxity@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-02-25 00:07:48 +00:00
MixityMaxityandGitHub 7f6fc2e359 Resprites Catwalks, adds three new varients (#31492)
* Resprites Existing Catwalks

* grey catwalk sprites

* white catwalk sprites

* black catwalk sprites

* updates hazard catwalk sprite slightly

* fixes a minor pattern fuckup on standard catwalks

* adds the turfs and items

* removes unneeded vars from the extra catwalk varients

* fixes missing catwalk floor basesprite

* adds a few catwalks to all stations

* fixes duped variables (im silly)

* actually fixes the duped vars (im even sillier)

* fixes a decal overlap on delta
2026-02-05 06:12:33 +00:00
203105788c [IDB Ignore] Heretic: The Mansus Re-Opened (#30738)
* fixes

* fuck my stupid chungus life

* Minion limit, heal fix, dead sac fix

* cooldown, no sacrificing star gazer or ascended alive heretics

* blade debuff

* oopsy

* Update tgui.bundle.js

* map diff bot what ya doing

* fuck that chat spam

* lets heretic armour hold a haunted longsword

* why not it makes sense

* do_after

* god I hate this bullshit

* other lewc stuff

* push

* heretic id card fix

* she tg on my ui till I css

* yes

* spent

* fix / ipc buff (real)™️

* moderate again

* revert

* no reserve

* bringing up to master

* update map files to master

* didnt replace centcomm

* beginning some rebalancing

* aggressive spread tweaks

* lots of tweaks and fixes

* trying to un-key the maps

* maybe this time

* this time????

* oops

* sql fix

* basicmob conversion

* paintings! and a critical influence fix

* rust + tweaks

* monster tweak

* small change

* removing this

* more tweaks. no more dusting

* added some examine_more

* flower seeds

* various tweaks. more to come

* no more conduit spacing

* fixed some dumb stuff

* silly stuff

* its always prettier

* bugfixes and linters

* linters, wow

* oops

* bah

* linter

* fuck you

* temp check

* hidden influence drain

* influence visible message

* tweak fix

* void cloak bugfix

* small fixes

* fixes

* do_after_once broken

* fixes and tweaks

* heretic blade potential fix + sacrifice changes

* batch of fixes

* tiny tweak

* rebuilt TGUI

* no greentext + rerolls

* logging + bugfix

* unused var

* small fix

* various fixes

* comment

* projectile change

* tgui rebuild

* tgui bundle redo

* rune issue solved

* influence visible now

* fix ui reloading

* new moon ascension + fixes + icons

* tweaks, species sprites

* tgui rebuild

* small tweak + linter

* harvester icon tweak

* spans

* fixes and tweaks

* caretaker nerf + tweaks

* potential fix for knowledge

* roller fix

* mad mask

* Update tgui.bundle.js

* void phase tweak

* Update tgui.bundle.js

* misc tweaks

* fix heretic not retargeting correctly with cryo

* simplify logic

* this is better

* lots of fixes and tweaks

* Update tgui.bundle.js

* linter

* linter

* fireshark and greyscale insanity

* fish

* Update tgui.bundle.js

* linter

* linter

* tgui

* no window shopping

* fish fix

* tgui rebundle

* moon smile runtime fix

* various fixes

* sacrifice fixes

* insanity is easier now, madness mask changes.

* bugfixing + teleport change

* linters + tweaks

* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Paul <pmerkamp@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2026-01-27 20:36:52 +00:00
warriorstar-orionandGitHub 481f035722 Metastation kitchen area redesign and related features, take 2 (#30754)
* Metastation kitchen area redesign and related features, take 2

* reviews
2025-12-18 23:46:17 +00:00
428d34980e [MDB IGNORE] [IDB IGNORE] The Floorening (#30568)
* New floors and decalized floor tiles.

* satisfy linter

* Add command decals, remove old "blue tile" decal

* update script number

* have ATMs put their decals on last

* add engineering decals

* update spritesheets

* lots of tile coloring fixes

* more engi tile fixes

* more tile fixes

* linters

* fixes conflict?

* fix layering issue

* fix merge conflicts

* merge conflict fix?

* box bridge fix

* holodeck fix, layering fix, chemistry is no longer yellow

chemistry is intended to be a 'light orange' to be placed atop white tiles, just as medical decals are to command decals

* rebuild tgui

* merge master into floorening

* Update 30511_turfdecalsfix.txt

* merge master into floorening

* rebuild tgui

* holodeck fix, null plating fix

* Delete 30511_turfdecalsfix.txt

* updatepaths

* rebuild tgui

* null icon fix

* Update meatpackers.dmm

---------

Co-authored-by: Alexios <skillpointHD@Gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-10-19 19:05:58 +00:00
CRUNCHandGitHub aaba002f18 Farragus Service Asteroid Polish Pass (#30240)
* Update cerestation.dmm

* Update cerestation.dmm

* continued work

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update maintenance_areas.dm

* CI

* Update cerestation.dmm
2025-09-04 06:44:20 +00:00
CRUNCHandGitHub 235403cc02 Farragus command asteroid update (#29685)
* creation

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm
2025-08-12 16:05:46 +00:00
warriorstar-orionandGitHub b5ac86c818 Add new line decals. (#29907)
* Add new line decals.

* undefs

* remove redundant alpha

* fix lint
2025-08-06 06:01:09 +00:00
OsetrokarasekandGitHub 0bd0b6d800 Floor Decals Color Standardization (#29291)
* Update decals.dmi

* i rember!
2025-06-03 18:21:29 +00:00
PollardTheDragonandGitHub 8e78f195a3 Adds abandoned server rooms to station maints (#28972)
* Adds server rooms to station maints

* Adjusted rooms to address balance concerns

* Linters fixes, adds fire alarm/air alarms

* More fixes

* Moves the metastation abandoned servers

* More fixes

* More fixes

* Forgot a light

* Fixes again

* Reverts excess changes to metastation

* Further fixes meta
2025-05-25 15:48:57 +00:00
QwertytofortyandGitHub 9329d265ab Adds 2 new ruins, a space and lavaland relay (#29335)
* Adds a space and lavaland ruin

* random shelves

* oops

* and this one

* desc update
2025-05-22 14:08:42 +00:00
YoureNotTheSharpestandGitHub 066cbea38b New arrivals for Cerebron! (#29008)
* del cargo, remade basic arrivals in place

* gives life to foreport maints

* wires up foreport maints and new arrivals

* the great wiring of new arrivals

* Cargo halls + cargo spacewalks? FUCK YEAH!

* Cargo pipes and wires

* beepsky paths to arrivals, fixed access added lights

* undoes sec and dorms modifications, adds vault

* added paints to the halls and cargopads, also expanded foreport maints abit

* cargo hall is real now, also more pipes

* nudged library, updated the small decal map and added one near security checkpoint

* reorientates the posters + firelocks and alarms

* messes with new cafe

* added vacant office + minor changes

* cleans up some floorpaint

* fixes pipes, lights, and a table

* lattice and cable fixing

* adds vents and air alarms to newly added maints, medical maints is kinda out of scope

* forgot a pipe under an airlock

* replaces some maintainence airlocks with "external maintainence" airlocks

* adds forgotten cyan piping

* adds firelocks and lightbulbs

* adds firelock under QMs airlock

* Polarizes QM airlock

* makes pipes follow wire above smith

* more air alarms

* made buttons in QM office QM access only

* Gives QM an auth keycard swipper

* one more light switch

* I lied more light switches

* adds some decals and more love to maints

* fixed the sinks

* removes inner-departmental spacewalk, moves around rooms in aft cargo, remakes maints spacewalk with shutters, touches maints around areas modified

* adds a cable and nudges an APC to its cable

* removed old explorers office, moved Nanotrasen rep and blueshields office in its place

* undoes some changes I made at some pooint of time

* I forgot my CMO office PR went through

* rotates vents and pipes to prevent crossing

* suggested changes + rooming

* CI

* extra APC +  Fire alarm + vents
2025-05-21 22:55:09 +00:00
kyunkyunkyunandGitHub bf28bfd604 Updates Rocky Motel (#28786)
* this motel rocks

* nvm i got chat gpt

* relocate icon

* oh it removed web commit
2025-04-09 19:26:42 +00:00
cd7cb01a1f Meet the Smith - New Supply Role (#28273)
* Smith role, access, access helpers, spawn point, comms, and IDs

* Area defines

* Hammertime

* Cyberiad Smith's office

* Forgot some atmos stuff

* Autolathable Hammers

* Formatting

* Toolbelts can hold hammers

* Initial work on smith machines

* Farragus Smith Office

* Placeholder sprites, mapping

* Smart hopper points and console messages

* More work on smithing machines

* Fixed mapping, added qualities, added smithed items, fixed sizing, fixed access

* Smith components, new materials

* New ores, material datums, furnace, power hammer, kinetic assembler, hammer act, item creation

* Missed one

* Grrr map conflicts begone

* Dirt begone

* Casts and smelting

* Linters

* Attack chain linters!

* Better grip to throw people into your industrial machines

* Placeholder spots in the DMIs

* UpdatePaths - Space ruins now spawn new space ores in their rocks

* Small changes - removed excess tgui code from hopper

* Fixed a button on emerald

* Attaching inserts and lenses. Tool bits are pain.

* Tool bit initial implementation

* Merge conflict resolution

* Attack chain grrr

* Fixed a pair of minor mapping issues

* Tool bit implementation, efficiency, failure rate

* Hot things burn hands

* Points fix on hopper

* New mining rocks for space exploration

* Areas on asteroids

* Machinery icons 1

Adds basic icons for the new machinery

* Vendor iconstate update

* Crucible touchups

* Hammer touchups

* Crucible Input Animation

Adds an animation when you deposit ores

* Added scanning the crucible with multitool to get mineral count

* clothing sprites part 1

* locker sprite

* job icons

* garment bag

* Smith locker mapping

* Insert and Bit removal fix

* Job menu alignment fix, Allowed_items and small spriting path fixes

* Adds new asteroid ruins to config

* Ore Sprites

* Hammer Sprite

* Item Sprites 1

* Sheets, Wall Ores and Trim

* Sheet iconstate names

* species uniforms

* Tabs

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Lens spelling fix

* Signalizes attaching and detaching modifications, fixes inserting items into smith machines, fixes cast bugs

* Fixed type lists

* Smithing machine bug fixes.

* Fixed adding modifications to items

* Crucible Lava Idle

Adds an idle animation for the crucible, but it needs overlay code to work.

* Fixed eguns

* Magma Crucible overlays and animations

* Machine broken/Off states

Adds broken, wires exposed (and on/off where appropriate) states to machines.

* Castivend recolor and Hot Items

* Overlays for all machines, new sprites for hot items, new checks, fixes

* Woe, farragus merge conflict

* update_appearance linters

* I have fat fingers.

* Forgot one

* transfer_item_to and qdel null check

* Usr to User

* Modsuits should not have inserts.

* Adds casting lip overlay

* Balance pass on movement debuffs and buffs

* Material movespeed changes

* Config Adjustments - USED FOR TESTMERGING. REVERT BEFORE FULL MERGE

* Math fixes for lenses and bits.

* Mobility suit no longer speeds you up, but negates suit-based slowdown like an oil slick potion. Fixed movement mods in material datums

* Bad var. Bad.

* Various fixes to bugs revealed in initial TM

* TYPO

* Lavaland base turf fix

* Paths in examine fix

* Adds an intercom to the workshop.

* Stamina-hybrid damage oversight fix for det revolver, uion, etc.

* Currently Operating Message fix

* Allows glass to show different turfs beneath. Adds plasmaglass section to workshop.

* Armor and upgrade fixes

* RCD tool bit equip fix

* Adds smith access to a few lists in access.dm that were missed in an oversight

* Indent fixes

* Fixes vending machine, allows tool bit use on mining equipment

* CI, you make me mad sometimes

* Removed duplicate code

* Name fix for CI again

* ORM now can handle space ores

* Adds space ores to Vetus drop and to trader inventories

* Fixes runtime with open hand attacking a lava furnace with nothing in it

* Adds crewvend kit to Castivend

* Fixes not being able to see new ores

* Adds drill and RCS to smith locker

* Map changes. Added cargo pad. Expanded catwalk. Moved vendors. Added recharger.

* Plant fixes

* Fixes doubled-up catwalk

* Emerald cargo windoor fix, small lavaland adjustment

* Small oversight for overlay fix

* Missing lightswitches

* Fixed stock parts mismatch in casting basin recipe

* Better support for power tools, grrr attackchain

* Better attack chain handling. Better handling for bit insertion

* Fixes handling of inserts with storage suits (like labcoats)

* sprites for bomber + plasmeme outfit

* Adds missing adjacency checks

* Buffs speed boost from upgrade - max upgrade reduces cycle to 2 seconds.

* Fixed floating lights, brightened the explorer's new room, expanded smith workshop slightly.

* Small hallway adjustment

* Illuminates metastation smith office

* Removes excessive decimals in magma crucible scan output

* Berserker should not have inserts.

* Buffs bit durability significantly, nerfs amplifier lens and densifier lense slightly

* Adds smith bomber jacket to loadout panel

* Adds random spawners for smithed items, adds random low-quality items to maints loot

* Adds traitor version of bulldog shotgun

* Revert "Adds traitor version of bulldog shotgun"

This reverts commit 1d39c59f07.

* Added check to assembler, moved desc changes to examine()

* plasmaman suit fix

* Fixed hot check when removing items from hammer and furnace

* Remaps lavaland workshop, fixed deltastation light switch

* Improper's the smith office name

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Compacts extra ore drops from Vetus

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* better looping

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Better loop

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Multitools don't need tool bits.

* Better variable names, fixed missing parenthesis

* Recursive hammering, removed attack animations when inserting items or using multitool on smithing machines

* window

* Update deltastation.dmm

* Update deltastation.dmm

* Update deltastation.dmm

* Fixes small oversights

* Minor lavaland remap

* Reverts TM-required changes in preparation for full merge

* Begone, stray font!

* Damn you cable CI

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-03-15 21:35:21 +00:00
ContrabangandGitHub f9f3b4aac6 Ports TG lazy-loading of map templates using turf reservations (#28101)
* kills off heaps

* turf reservations

* lazy loading map templates

* atmos + a comment

* port LISTASSERTLEN and rename a proc

* CI happy

* yes

* oops

* removes blocks air and adds comments
2025-02-07 10:15:08 +00:00
ad4e5a66f7 [PTBF] Hallucination: The Backrooms (#27710)
* add backrooms hallucination

* mapmerge

* fix some backrooms issues and add some error handling stuff

* change backrooms carpet

* remove code that isn't doing anything

* tick new backrooms file

* try a new method with movement

* don't smooth corners

* fix red carpet hiding under backrooms carpet

* fix multiple turfs

* accidentally removed important code tracking items, oops

* implement new solution to the backrooms clone thing

* hmm so that's what the icon does

* indentation machine broke

* remove the tucked away spawn locations

* add comment for follow_movement

* revert oversight (the bar can keep its bevvies)

* put the thing back in that I wasn't supposed to remove

* Update code/modules/hallucinations/effects/backrooms.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Paul <90473506+pwbokie@users.noreply.github.com>

* Update code/modules/hallucinations/effects/backrooms.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Paul <90473506+pwbokie@users.noreply.github.com>

* fix missing comma

* code improvement tweaks from DLG

* add a fade out and in

---------

Signed-off-by: Paul <90473506+pwbokie@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-01-25 13:27:39 +00:00
QwertytofortyandGitHub bcc794ee3b Rusting off the elements system. Makes rust appliable to turfs, adds heretic rust to revenants. (#27367)
* puts rust on hold

* fixes overlays

* defines it

* need this

* fuck

* never work on conflicts during a rpg

* continue work

* rust works
2025-01-12 20:58:33 +00:00
TojoandGitHub 20724b9dd3 Wood Floor, Wood Table Resprite (#27829)
* Wood Floor + Wood Table Resprite

* New Tableflip sprites (i went too hard on these lmfao)

* Wood Table Flip Consistency Fix

* Changed the shading on the table supports of flipped tables.

* Quick fix

* 255 was empty, I guess my smoother didn't fix that one, so heres that.
2025-01-10 02:14:07 +00:00
TojoandGitHub f3a692b3a7 Resprites Grimey Flooring into Grimey Carpets, with smoothing. (#27882)
* Adds new Grimey Carpets to replace old ones.

* PR time

* Moves typescript into updatepaths folder

* Remove duplicate
2025-01-10 02:09:40 +00:00
b55bef2ed2 Nanotrasen Career Trainer - REVIVAL (PT1) (#26512)
* Nct ID

* Preferences, job creation, access and other stuff

* Sprites, defines, hidden job pref and other stuff!

* Missed a comma

* Sprites updated, clothing code, outfit and id

* Fix a small oops

* Data chip + Sechud icon

* Offstation, access, datachip code, ticket autoresponse and a lot of other stuff.

* Typo, spritesheet fixingg and icon color

* Telebaton removed, not allowed to scan ERT IDs, blacklisted some access

* Applies suggestion

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Applying Suggestions!

* Forgot to increase the number of slots, oops

* Added a few items that I forgot, applying suggestions.

* Fix check fail?

* Mapping Tools/Icons.

* Office added to all maps, a few modifications to fit.

* Adds ACCESS_TRAINER to who needs it.

* Fixing check fails.

* NCT Beret obj are now where they're supposed to be

* Suggestion

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Sprites fix + NCT flag

* Code Suggestion

* Sprite update

* Suggestions

* Diagoras Office, conflict fix.

* Day 1 fixes, suggestions.

* bundle rebuild

* Fixing a few issues.

* Mapping review + Suggestions

* Fixed check fail.

* Conflict fix + You shouldn't be able to insert the NCT chip into an id console

* Fix map conflicts

* Plasmaman icons and Kidan icon fix

* Conflict fix?

* A few changes following feedback.

* Small description changed, as per requested feedback.

* Suggestions/Fix

* Forgot some mapping issues

* Suggestions

* Fixed?

* Fix linters

* More fixes

* aaaaaaaaaaa

* Christa's reviews

* Naming stuff

---------

Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-30 21:13:52 +00:00
warriorstar-orionandGitHub 586805a318 refactor: Migrate more random_spawners to random/spawners and mapping helpers. (#27017)
* refactor: Migrate more random_spawners to random/spawners and mapping helpers.

* set script PR number

* maybe using a reserved keyword isn't a great idea

* oh i guess we're done

* whoops

* make code actually work

* gnarg

* rerun updatepaths for recent changes

* rerun updatepaths for recent changes

* fix build
2024-11-23 14:23:24 +00:00
warriorstar-orionandGitHub dc4f9cadf8 fix: arrivals tile colors and missing fulltile (#27308) 2024-11-10 13:26:56 +00:00
DGamerLandGitHub 9fe906db93 Removes a lot of unused floor sprites (#27057)
* Removes a lot of unused floor sprites

* Fix floors

* OOPS
2024-10-22 10:50:48 +00:00
AylongandGitHub ad12523b47 Resprite Disco floors (#27000) 2024-10-22 09:27:14 +00:00
QwertytofortyandGitHub e118716f16 HAUUUUUUUUGH (#26959) 2024-10-02 00:03:27 +00:00
KyaniGitHubCharlie Nolan1080pCatAffectedArc07paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>S34N
32719e2f99 Adds map: EmeraldStation (NSS Diagoras) (#26438)
* fleshed out engi and asteroid

* command work

* more department fleshing out: sec

* sec work

* perma work

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* med and dorms fleshing out

* sci and service fleshing out

* Update EmeraldStation.dmm

* APCs done + detailing

* Update EmeraldStation.dmm

* wire work

* more wire work

* wires and LIGHTS

* ATMOS DONE now onto DECOR

* AI/status monitors

* intercoms and newscasters

* Wall items and cameras!

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* moved the file to the correct area

* bugfixes, starting up the map

* refining the asteroid

* merge fixes

* logs of bugstomping

* more bugfixing

* bugfixing

* bugfixin

* trying to make the stupid lava work

* adds plasma vent for test

* more testing

* swapped file places

* vents work now!

* Update paradise.dme

* vent sprite update

* file corrections

* Asteroid MILLA changes

* adds a new MILLA atmos  type

* Build MILLA

* oopsie

* fixes

* removed testing code

* reverts map start

* reverts the atmos change

* respriting geyser

* comments

* Update code/__DEFINES/atmospherics_defines.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update geyser.dmi

* Update paradise.dme

* fixing past merges

* adds some missing items from merges

* reverting

* reverts changes again

* deleted unused file

* oops forgot nearspace areas

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/area/ss13_areas/engineering_areas.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Lots of map fixes

* Update EmeraldStation.dmm

* trying to unfuck the milla merge

* removed station from dme

* fixes/small tweaks/suggested changes

* removed errant turret

* redid telecomms

* Update EmeraldStation.dmm

* rebuilding everything

* redoing security

* more sec work

* perma shaped up + more items

* renamed properly this time

* resetting atmos code

* more secwork and move papers off varedits

* more secwork + dorms + funeral services

* added new areas + pipe/wires/floors

* security electrified windows/wires/alarms/lights

* cameras, dorms pipes/ires/alarms/apcs

* merged

* disposals

* lots of wall things + added map datum for testing

* pipe fix for linter

* fiddled with maints

* minor maint edits

* fixes + maint work

* more bugfix

* even more bugfixing

* MORE nearspace fixing

* dumb nearspace fix

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* a LOT of fixes + door access

* disposal pipe update  script

* oops linter fixes

* fixed viro button runtime

* finished maints + space decor

* removed hall light switches

* fixed solars areas

* removed errant lattice

* remove agent B from asteroid

* wall bump placement refining

* apc fix

* bugfixing

* minor maint change

* bugfixing

* burn tile on node fix

* changed official name

* bugfixing

* added genetics locker+figures

* bug hunting (buttons mostly)

* added firelocks. oops

* added temp webmap + bugfix

* Update emeraldstation.dmm

* new webmap. again

* added the perma tools

* nanomaps

* bug fixes, fixes, and more fixes

* more tweaks

* cable fix

* more bugfixing

* Update emeraldstation.dmm

* tiny fix

* fix AI sat turrets

* more bugfixing

* MORE bugfixing

* bugfix + ruins soundfile

* pipe bugfix

* fixed toxins pipes. junctions bad?

* swimwear :)

* remove errant QM gps

* rnd shutter button missing

* potato layering fix

* add bridge request console

* fix window tint in interrogation

* added some clothes

* nanomaps2, asset boogaloo

* modified an empty hall, added some perma cams, minor fixed

* forgot to save before push oops

* widens sci maint hall + bugfix

* gives theatre its autodrobe back!

* moved borg spawns

* moves nuke op default spot

* new asteroid mix + botany tweak

* adds cremator button

* new sign + moved pod + bugfixing

* cable fix

* engine, sci chem, and surgery tweaks

* more bugfixes and tweaks

* more tweaks

* adds a few windows back to robotics

* bar was missing pun pun!

* corrected misplaced atmos machines

* re-added the bathroom

* fixes atmos waste disposal injector

* modified mr potato

* changed bathroom area

* minor toxins tweak

* small wall decor tweaks

* removes errant lights

* removes errant opier

* LOTS of fixes/tweaks + adds CO2 to asteroid

* gave maint some boxes + cable fix

* duped brig lock

* adds masks to medbay storage

* adds missing gues passes

* cleanup from kitchen rework

* gives solars enough glass to complete it

* adds another defib to cryo pods

* makes asteroid sign fireproof

* perma maint now opens with virus + bugfixs

* bugfixing + adds missing holopads

* more holopads + bugfix

* adds some smoke vendors

* kitchen area tweak

* fixed errant rack

* rearranged/spread out cig vendors

* moved a cig machine again

* added RD tint button

* undid a brig area change

* removed errant posters

* added filing cabinets + bugfix

* maint morgue tray fix

* adjusted chapel + bugfix

* fixed palms + minor sec floor tweak

* adds forgotten magi and clown starts

* gave engi a shower

* reworked robotics + atmos bugfix

* geysers now work at 1/10 capacity when overpressure

* bugfixing + tweaked overrides/variables

* rework warden office

* bugfixes + adds some holopads

* added missing bio shutter

* more small tweaks

* adds RnD rework + gives mag some things

* fixed fabricators

* tweaked robo + added rnd server board

* added rnd backup circuit

* bugfixing

* bugfixing again

* bugfixing

* fabricator fix

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-09-13 18:18:25 +00:00
CRUNCHandGitHub 2b5cf38bbf Changes Area Classification of Farragus Science & Cargo Solar Arrays, Standardizes Solar Areas. (#26458)
* Update cerestation.dmm

* Update cerestation.dmm

* Standardized Solar Icons and Names

* Area Reconstruction

* area correction

* The other correction.

* Update cerestation.dmm
2024-08-19 12:28:47 +00:00
AffectedArc07andGitHub bd91a1b962 Obliterates the RSC (#26498) 2024-08-15 18:20:11 +00:00
warriorstar-orionandGitHub 20f8fd10e3 remap: Farragus Cargo. (#26042)
* remap: Farragus Cargo.

* fix rock edges and struts

* docking ports aren't nearspace

* separate atmos/EVA in starboard south, fix doors, add store trash

* lint fix

* i uh forget

* qm windows, maints improvements

* more maints decorating

* fix electrochromic area

* tiny bit more mining-themed

* sean review #1

* fix windoor access on cargo office

* 1080p review 1

* accidentally uncommited changes from above review

* one last grilled spawner replaced

* misclick

* fix disposals corners and y-junction

* completely forgot to update sec telepads

* as many APCs as possible pulled into maints

* fix conflicted tile

* remove disconnected disposal pipe

* fix disposals redirecting into psych office
2024-08-04 17:27:37 +00:00
2ce4c20515 Adds the Lance emergency shuttle (#24806)
* WIP: Adds the Lance emergency shuttle

* untodo

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* c-c-c-changes

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* Update code/datums/shuttles.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
2024-05-15 14:13:51 +00:00
9e04910ce6 Adds the Nuclear training bomb, second try (#25352)
* Adds the Nuclear training bomb

* boxstation

* other maps

* moved camera

* missing cable

* last fixes

* delta, last fix

* Update code/datums/wires/nuclearbomb_wires.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* cyberiad missing floor

---------

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-05-14 12:53:00 +00:00
df8fef119d Ports TG bamboo and Punji Sticks (#24497)
* adds most things

* STOP BECOMING CRLF

* half the sprites ported

* adds floor turfs, hopefully

* adds bamboo stack recipes and parameter documentation for datum/stack_recipe

* adds the crude syringe and sprite

* Revert "adds the crude syringe and sprite"

This reverts commit d949332055.

* adds crude syringe and sprite

* nevermind, goon license moment

* bamboo walls, false walls, and sprites

* caltrops check for shoe thickmaterial flag

* added spear and fixed filepaths

* smoothing and caltrops are even more broken

* Fixes sprite smoothing and caltrop weirdness

* whitespace

* fixes tile stacking

* Henri review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* royal blue and red carpets no longer smooth

* henri review

* actual henri review, thanks git

* Henri review electric boogaloo

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removes bamboo walls (rip)

* Update code/game/turfs/simulated/floor/fancy_floor.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-04-07 09:38:10 +00:00
9096c5f0b9 Ports the NTSS Raven from TG station. Slightly remaps delta escape / faragus escape (#24567)
* R A V E N

* docking ports. Delta needs  tweak

* yep

* raven generators, increased range / anchored

* names / fixes wrong generators

* decore / missing decal

* NTSSS RAVEN

* purge this

* oops

* should be good

* Update code/modules/mob/living/simple_animal/friendly/mouse.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-03-21 21:21:56 +00:00
McRamonandGitHub 38c7b3bb53 Resprite of circuit floor tiles (#24435)
* sprites

* deletes unused sprites

* sprite2

* lil fix

* yet another fix

* yet another
2024-03-10 18:19:10 +00:00
QwertytofortyandGitHub 16c1a50f0f nearspace is radioactive again during radstorms (#24375) 2024-03-03 17:51:33 +00:00
9b79902cf7 cere: create distinct nearspace area for disposals (#24096)
* cere: create distinct nearspace area for disposals

* catwalk restore

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-02-14 10:14:59 +00:00
warriorstar-orionandGitHub 4341e0c762 add aft/stbd solar area icons (#23984) 2024-02-06 18:26:01 +00:00
warriorstar-orionandGitHub 8d4a68b391 remove duplicate space parallax icons and floors (#23742)
* remove duplicate space parallax icons

* floors too
2024-01-14 12:35:34 +00:00
9b534f3c3f Ports baby watcher from TG* (#22768)
* Ports baby watcher from TG*

* ah. I see. Alphabetical. Should have seen that coming.

* here comes the better mapped boi 🎵

* removes recursive_loc_check, uses get. also removes the debug always place WHOOPS

* fixes arguments, need to update and edit map

* adds bombable turfs

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* changes

* ///

* R-R-R-RUN IT BACK

* Update code/modules/awaymissions/mob_spawn.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* oops spacing

* part 1/2

* Update code/modules/awaymissions/mission_code/ruins/watcher_grave.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* 2 / 2

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-16 12:03:07 +00:00
OctusandGitHub 2ea16f0f77 Updates wooden floor sprites v2 (#23147)
* revives a good pr

* updated wood floors by ramen
2023-11-14 12:59:20 +00:00
Henri215andGitHub 183571ac33 Removing a few unused dmi files (#23223)
* Removing a few unused dmi files

* that one is needed

* wrong place

* the rest
2023-11-12 19:43:06 +00:00
S34NandGitHub 49b0071400 Repaths some decals, makes copyTurf copy decals (#22528)
* why do I do this to myself

* pass 2

* maps

* delete this

* PR number obtained

* Revert "maps"

This reverts commit 87926f4a0c.

* maps
2023-10-30 20:15:14 +01:00
d750db7011 Being in space kills you again with solar flares / rad storms. Also now affects deep space (#22264)
* Being in space kills you again with solar flares / rad storms. Also now affects deep space

* oh god unit tests.

* fucking autocomplete

* I will murder autocomplete. It will not survive.

* Rename trait

* Update code/datums/weather/weather_types/radiation_storm.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-09-19 16:57:09 +01:00
AylongandGitHub 496d749450 Walls & windows refreshing (#21978) 2023-09-01 23:04:27 +01:00
8803f536b7 [READY FOR REVIEW] Lava land generation overhaul / variety (#21838)
* she lavas on my land till I chasm?

* need this

* whoops

* qwerty you are a dumbass

* now with 12 more maps per map

* repaths mesons, advanced mesons / meson implants show chasms

* more stuff

* range not radius dipshit

* sprites yipee

* define it

* undo mesons

* removes things I missed

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* I'm lavaing it

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-01 22:40:39 +01:00
Vi3triceandGitHub 19c718ac78 Tweak floor tile replacement and add missing catwalk sprite (#21607)
* Cat.

* Cat.
2023-07-17 15:36:51 +01:00