Commit Graph

1344 Commits

Author SHA1 Message Date
Leon Friedrich
3f2144f3cd Fix missing device links in maps (#18273) 2023-07-25 12:16:51 +10:00
Emisse
84b6addf69 Retire Moose 2 (#18265)
* Delete moose.yml

* Update default.yml

* Delete moose.yml
2023-07-24 14:45:32 -06:00
DerbyX
8345778eec Glasses/Hud Art Dump with Minor Changes To Beer Goggles (#18130)
* Glasses/Hud Art Dump

* Forgot to change omni ID

* Changed id in other ymls to match new one

* Redo

* Updated Map Beer Goggles IDs

---------

Co-authored-by: Derby <Derby@ss14>
2023-07-24 14:32:33 -06:00
Leon Friedrich
a4063a5e33 More machine linking related map changes (#18246) 2023-07-24 11:29:57 +10:00
Leon Friedrich
5172188a48 Migrate machine linking and resave all maps (#18243) 2023-07-24 10:35:09 +10:00
Filler
621e6c12b7 Update of Terminal (#18184)
* Update of Terminal

* Terminal Update

* Update of Terminal
2023-07-22 23:32:04 -06:00
Filler
809df62a8a Box station psychologist (#18174) 2023-07-20 00:50:47 -06:00
Emisse
a91c184b83 omega update (#18159) 2023-07-19 16:05:57 -06:00
Ubaser
3caa1ea356 Power balancing + other fixes for Core (#18150)
* basic fixes

- add four more radiation collectors
- allow for a two core ame on the station
- make the singulo maints access on the right engineering-locked
- slightly redecorate the flooring in arcade
- fix the type of light in substation room below ame
- replace the engineering access door to grav with command locked
- rotate some of the chairs in cafeteria to add variety

* changed perma grilles
2023-07-19 14:40:44 -06:00
Ubaser
afef518fc5 stamp + wording fixes (#18144) 2023-07-19 01:57:45 -06:00
Emisse
27f1c1a289 striker update (#18143) 2023-07-19 01:36:25 -06:00
Ubaser
54fc803fdd Core: NEW station map (#17269)
* add map

(in resources)

* Edit 1

- replace transit evac with rod evac
- add prototype for map

* Add reporter in the list of jobs

* add to pools

* fix issues

* fix more issues

* reintroduced transit

i was dumb and removed it for whatever reason

* Minor changes

- fixed an atmos light
- removed a bunch of tiny fans
- removed ratking spawns
- switched out microwave in evac
- lower weh count
- change some dorm glass to wall
- fix some maint doors not being locked
- change reinforced window to normal one in tool room and boxer hallway
- add janitorial trolley
- greatly shorten solar array
- increase size of disposal pad
- fix airlocks in bridge
- change entrance into vault room
- fix SMES bank
- change kitchen table
- change posters being on top of windows
- add more gear to the armory
- change rails to directional reinforced windows in security
- change sec entrance to brig
- change warden doors to armory
- remove a spare light in med
- adjust chem layout and add a secondary entrance
- have the chem entrance accessible to maints
- remove defib in cargo
- shrink QM's room
- add missing blast door button in cargo
- fixed one of the maints doors being engi locked
- switch det drobe in maints to a winterdrobe
- changed a wall to a door in maints
- remove a couple lights in med
- add missing tiles in med
- removed microwave and grinder in maints
- add med-maints connection
- change maints gold room to solid and rusted walls
- change carp room to a butchering room
- move atmos fireaxe further
- change cat ears for magician tophat

* power fix

- electrified the singulo grilles
- (hopefully?) fixed the save file
- potentially fixed grav SMES
- add more APCs to fix power in sci

* improve arrivals and other misc fixes

- fix sci and maints APCs
- improve arrivals
- add new decal
- add myself in map_attributions.txt
- add latejoin spawnpoint

* address other fixes

- change png to lowercase (potentially fixing the "invalid rsi" error)
- add reporter spawns
- add more fire alarms
- add a note to cryo

* small changes

- expand maints around atmos
- add rad shutters to singulo
- remove a tiny fan i missed in engi
- add windows in maints around the bottom of the artifact room
- remove the double wall in disposals
- replace a couple beds in med with stasis ones
- remove the table with the charger in sec and move the charger to warden desk
- change front det walls to reinforced

* balanced solar panels

- made the south solar panel smaller
- added a new solar panel around maints bar

* improve med slightly and temp. remove arrivals

- add a missing medirobe
- add more chairs to med
- increase the number of starting med kits
- TEMPORARILY remove arrivals

* readd arrivals and add more maints + minor tweaks

tweaks include adding an electric fence around perma

* tweaks

- add a couple hardsuits to atmos
- add robotics to sci
- add atv to sci
- half the gold count in maints
- fixed a double meal spawner in dining
- clown now has a spare backpack and mime has a spare crayon
- bridge has less chairs

* hopefully fix conflict

* fix conflicts (maybe)

(and actually add the tweaks since i forgot to copy it over)

* attempt to fix conflict

* re-add core to map pool

* temporarily remove evac rod

* delete map pools

* re-add map pool

* for the final time i am re-adding the rod

* forgot to re-add to map pool

* changes

kind of too tired to write, but lots of tweaks and ai room+ computer board room, and uh pondering orb + onstation asteroid

* next update

- shrink solars
- fix some cabling going under walls
- fix evac substation not recieving power
- made the arrivals "disposals" have a stronger indication
- changed reinforced windows to normal windows in maints (the thin type)
- remove most double walls
- add flap to disposals
- fix SMES crossings, removed one at solar + other issues
- moved a set of cafeteria/dining area airlocks up
- removed a bardrobe in maints
- added extra dining tables to the north of kitchen
- add more maints around security
- removed maints mine
- added exam signs to medical
- added toolboxes to greytider church
- removed one of the booze-o-mats from maints
- changed the floor in the artifact corridor
- added rusted door to a secret room
- removed spare R&D server
- improved flooring in captain bedroom
- moved the firelocks touching R&D blast doors
- moved the water cooler that was outside engineering
- added water cups to engineering break room
- added a bunch of missing tiles underneath doors
- changed the maints chemistry door to an actual maints door
- changed a couple tile types beneath doors
- added bananaphone to clown room
- added missing bedsheets
- removed some food from cafeteria/dining hall
- switched vendomat in warden office to the security one
- slightly redecorated chapel decals
- switched out hop's mass scanner for a station record one
- rotated medical front desk computer to face north and added a crew monitor one as well
- moved medical techfab and added two paramedic lockers

* forgot to add some changes

- rotated salvage magnet up
- added filing cabinets to head rooms (QM, captain, HOS)
- replace surgical prep beds with normal ones
- add more decor to exam rooms including medical items and posters
- added a couple tools on the surgery room table

* updating minor things

yes

* Playtest+review changes

- add librarian bedsheet
- remove sink in janitor room
- fix eva disposals
- add chem clothing vendor
- fix north solar door not being locked
- add mice spawns
- add more microwaves
- change med front door to glass variant
- add more food vending machines to cargo + med
- add tools+insuls to cargo
- add more radiation suits
- add more cig vendors
- replace an R&D computer with spare command telecomms (currently in vault)
- fix atmos by replacing the gas room air vents with passive variant
- add spare crowbars in arrivals
- name the radiation shutters button
- add extra spray and mop to janitorials
- fixed an apc
- add screwdriver to telecomms crate
- fix armory closet
- remove a couple oxygen/nitrogen canisters in atmos
- change eva room permissions
- fixed some tiles below airlocks being missing
- fix double wall in cargo
- added a couple windows to treatment rooms in med
- remove soda and booze dispenser in bridge
- POTENTIALLY fix power around PA
- slightly tweaked the asteroid
- slightly tweaked atmos
- added an extra secret
- added joints to musician room
- add an autodrobe
- added another clothesmate
- potentially fixing broken maints airlocks
- make the rad shutters be down by default

* re-add missing files that break the map

* forgot to add core to pool

* updates

- change externals airlocks in arrivals to glass
- change the tiles below medical doors to the mono type
- switch the unused tabls in tool storage to chairs
- add an anatomy poster to medical
- change the glass wall in front of the bookshelf at QM office to solid
- switch two of the blast doors at cargo to airtight plastic flaps
- rename the cargo blast door button
- relocating the firelock in the arcade room to under the maints door and adding a black carpet
- add the command encryption key to the spare vault telecomms
- add a pai to bridge and a couple station maps
- add a couple cryoxadone and cryostasis beakers to cryo
- add radiation signs for the corridors outside singulo
- add a couple butterfly spawners to zookeeper enclosure
- add random t3 part spawner to science
- add DAW board to board room
- add a cursed chair randomly in maints
- change warden secure window to armory locked
- add an omega soap to hop bathroom
- add a christmas-themed maintenance room to the right of perma
- add bunny ears as a maints spawn
- add a rage cage in maintenance (including thunderdome helmets)
- add a fancy and xmas crown to maints
- add an extra large beaker to medical
- tweaked the flooring slightly in evac lounge
- another seperated small asteroid to the south
- change how the prison grilles look slightly
- add a few commons keys to the rack in telecomms
- change sci anom lights to normal type
- add a few chairs to ame room
- put ame scribbles in ame room, and removed the one in chapel
- add a microphone to reporter room
- covered the waste pipe above disposals so you cant see it

* more and fixes

- add a defib cabinet to rage cage
- change rage cage grilles to entirely LV using APC in power room
- add a window to the other side of the desk with greytider church
- add another way into maints through salvage door on other side of surgery
- add a cup next to the poison wine bottle
- add ambuzol syringe to viro
- add more reinforced glass floors and fix flooring issues
- add a button to blast door perma
- add trash to perma + trash bag
- add phone to bridge
- add a body bag to chapel
- add glass shards in maints
- make an engineering room with spare thrusters and other mats
- change number of vault lights from 3 to 2
- add "antenna" lattice spikes to exterior
- add a scrubber/vent to rage cage

* additions

- add more radiation meds, specifically in medical and all head lockers
- added a broken down ship connected to maints
- remove one light in weh room
- add wooden baton spawn in maints
- add a blast door to vault front that only captain has a remote signaller to
- slightly redecorated perma
- switch the glass floors in dorms to reinforced
- add cleanbot spawn to the cafeteria
- add the sign "THE SINGULO" to bar
- add bee mask to maints loot
- add blue banners to conference room
- add default body bag spawn to cloner/shredder
- add brigmed headset spawn to the brigmed secret
- add medical beret spawn to medical
- add combat medical kit to hos spawn

* more

- added blahaj to medical front desk
- add power monitoring + solar control computer to engineering
- add a jetpack to engineering
- add CE winter coat to CE
- switch the burger on kitchen front desk to jelly donut
- add tool closet to tool room
- add bar stools outside kitchen
- add wall emergency closets/fire closets
- add toolboxes to tool room
- change one of the doors leading to grav to highseccommandlocked
- add a spare appraisal tool and two hand labellers to QM's office
 -add a cargo bounty computer to cargo
- add a button to optionally close shutters in the two stasis rooms
- add genedrobe to cloner/shredder room
- fix the tile underneath cmo office
- add rusted wall to weh room
- remove an extra mv in rage cage room
- add medical beret spawn to med
- fix rage cage power

* fix broken shuttle object rotations

* tiny tweaks

- switch one of the nitrogen canisters in atmos to plasma
- switch brigmed secret to bananium honker

* emisse review

- remove zookeeper spawn and make the room accessible
- double reinforce armory and add an optional blast door
- make maints in sec more accessible
- remvoe disablers in armory and put disabler safe in sec gear room
- fix missing door in christmas room
- switch maints nitrous oxide tank to storage type
- remove presents under christmas tree and put cookies on table
- add another maints entrance around singulo
- add nutrimax to hydroponics
- add intercom to engi front door
- remove golden clown shoes in vault
- switch bananium golden horn for gilded variant
- remove regal crown thing
- add a window into cloner/shredder room
- delete the generator/substation/mini-grav/red phone from broken shuttle
- fix power regarding PA

* BYE BYE SIGN

i loved the sign, but :(

* minor tweaks

- add deckard in vault freezer
- switch one of the gilded horn secrets to a rainbow crayon

* fix missing decal and removing my custom one

* emisse review

- remove the plant spawner overlapping baricade in sec
- switch insuls in sec maints to the budget type
- change exam room windows to tinted
- add more decor where the suitsign was
- add state laws sign to ai room
- fix map prototype

* reduce atmos job count by 1

* reorder pools

* temp remove the dock between broken ship
2023-07-19 01:23:48 -06:00
Emisse
b1e7f877dc nukie planet update (#18141)
* nukie planet update

* cute floor
2023-07-19 00:54:18 -06:00
Emisse
925971472f box update (#18129) 2023-07-18 14:39:45 -06:00
Emisse
487487811b packed update (#18128)
* packed update

* packed update
2023-07-18 14:37:29 -06:00
brainfood1183
7e2eb1c212 Origin Station Update 15.07.2023 (animal breeding, bullet vests) (#18065) 2023-07-16 00:07:45 -06:00
Emisse
711b9c5126 packed update (#17997)
* packed update

* rechargers
2023-07-12 13:09:43 -06:00
Emisse
e564f47c52 striker update (#17989) 2023-07-11 23:47:00 -06:00
Emisse
7856cc22e5 bagel update (#17988) 2023-07-11 23:46:54 -06:00
Emisse
28371111f5 terminal update (#17985) 2023-07-11 23:46:46 -06:00
Emisse
657c6a32b1 Dart update (#17977)
* dart update

* dart update
2023-07-11 20:59:53 -06:00
Emisse
2057ff0028 packed update (#17923) 2023-07-10 00:14:19 -06:00
Emisse
97c2c7b628 nukie planet update (#17924) 2023-07-10 00:14:10 -06:00
Emisse
0af38e6d65 packed fax and pa board (#17894) 2023-07-07 23:49:34 -06:00
deltanedas
96cc37123e saltern 4.14 (#17880)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-07-07 12:39:17 -06:00
Emisse
c1fe000a7b sus (#17873) 2023-07-07 02:06:04 -06:00
Emisse
d0d95865a9 packed update (#17869) 2023-07-06 20:51:52 -06:00
Emisse
907474533b wire fixe (#17868) 2023-07-06 20:11:14 -06:00
Emisse
2005bae178 Packed (#17864)
* map

* prototype

* pools

* real proto

* latejoinspawnpoints
2023-07-06 18:30:23 -06:00
metalgearsloth
3eb93988e5 Disposals refactor (#17803) 2023-07-06 13:39:34 +10:00
brainfood1183
1b160b53c6 Origin Station Update 04.07.2023 (bounty console) (#17818)
* adds bounty console

* more all access external airlocks
2023-07-04 18:29:46 -06:00
Emisse
d24c75ec71 resave and power fixes and misc (#17738) 2023-06-29 13:12:56 -06:00
Emisse
f0f2574b03 movey solar uppy (#17737) 2023-06-29 12:47:10 -06:00
Ubaser
e1034d0193 Rod: NEW Evacuation shuttle (#17129)
* add shuttle

* change station

Changes from Box to Marathon

* address issues

- switch one of the glass walls for a shuttle wall
- added another generator and redesigned the engineering compartment
- added directional reinforced walls for the seating area
- added more chairs!
- another seat for medbay
- shrunk the size of bar and moved bridge doors
- rotated the fireaxe, APCs and wall cabinets to face the correct way
- removed the bardrobe and clothesmate
- other miscellaneous fixes
2023-06-29 12:46:39 -06:00
Emisse
1ca9745cfa fix one silly wire (#17730) 2023-06-29 04:01:22 -06:00
deltanedas
9cd8d25ae7 more expedition changes (#17403)
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-06-29 00:01:27 +10:00
Emisse
2488dd4ecd salvage updatety (#17705) 2023-06-28 03:10:14 -06:00
Emisse
abc2e04d62 mining shuttle poor (#17701) 2023-06-27 18:57:13 -06:00
Emisse
76cd2be31a bagel hotfix (#17700) 2023-06-27 17:28:03 -06:00
Emisse
3fa8f906eb small update (#17672) 2023-06-26 19:43:02 -06:00
Nemanja
5c60a27c7c Make item size scale with stack size (#17623)
* Make stack count affect item size

* and the test, too

* readd this check

* vwoom

* huh

* if you ever read this commit message ping me on discord in #contributors

* changerinos
2023-06-25 10:44:37 -05:00
Scribbles0
25bd1eba19 cargo bounty computer (#17596) 2023-06-24 13:58:51 -06:00
Scribbles0
a88c16f3e9 bounty computer + minor deletions/fixes (#17597) 2023-06-24 13:58:39 -06:00
deltanedas
eec74aa54b saltern 4.13 (#17606)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-24 13:58:25 -06:00
Sailor
8ce0370544 Commit trolling (#17607) 2023-06-24 13:57:56 -06:00
Emisse
95d6f828e0 omega cargo bounty (#17571) 2023-06-22 15:26:42 -06:00
Emisse
5641803089 meta cargo bounty (#17570) 2023-06-22 15:26:19 -06:00
Emisse
501b14a1d4 marathon cargo bounty (#17569) 2023-06-22 15:26:06 -06:00
Emisse
6cd36ce67b fland cargo bounty (#17568) 2023-06-22 15:25:59 -06:00
Emisse
4c474c5094 box cargo bounty (#17567) 2023-06-22 15:25:51 -06:00