Commit Graph

56 Commits

Author SHA1 Message Date
Nemanja
2d08f02d23 Material generators from Afterlight (#18387) 2023-07-31 14:42:38 -04:00
Emisse
3321039c87 mining shuttle update (#18309) 2023-07-25 21:56:14 -06:00
Leon Friedrich
5172188a48 Migrate machine linking and resave all maps (#18243) 2023-07-24 10:35:09 +10: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
e564f47c52 striker update (#17989) 2023-07-11 23:47:00 -06:00
Emisse
657c6a32b1 Dart update (#17977)
* dart update

* dart update
2023-07-11 20:59:53 -06:00
Emisse
d24c75ec71 resave and power fixes and misc (#17738) 2023-06-29 13:12:56 -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
abc2e04d62 mining shuttle poor (#17701) 2023-06-27 18:57:13 -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
PuceTint
e441bdac2d fix transit atmos (#17404) 2023-06-17 13:15:58 -06:00
Emisse
548d2ca477 arrivals (#17373) 2023-06-16 01:20:56 -06:00
deltanedas
626b2750c2 fix transit power (#17200)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-15 23:51:37 -06:00
metalgearsloth
23b6d87a79 Hotfix NPC pathfinding (#17360) 2023-06-16 01:01:26 +10:00
deltanedas
db9ef092d8 dont lock escape pod (#17240)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-10 21:52:35 +10:00
metalgearsloth
6cf2b5c3ce Fix EmitSoundOnCollide serialization (#17212) 2023-06-09 01:08:22 +10:00
Ubaser
35ebcc66df Transit: NEW Evacuation shuttle (#17095)
* add shuttle

* fix mistakes, improve consistency

- adds tiny fans to airlock
- changes LED to lights
- adds supplies to med
- engineering door changed to not be glass
- added tile beneath engi and medbay door
- changed security cell
- added SMES to power
- added variety (variantize)
- saved as grid instead of map

* apply changes

- replaced plastic tiles with steel
- removed fireaxe in bridge
- rotated defib the correct way
- switched a couple LED lights out
- replaced potted plants and vending machines with their appropriate spawner
- adds more chairs

* fix defib

changed from empty to filled

---------

Co-authored-by: Ubaser <ubaserblueknight2@gmail.com>
2023-06-04 20:52:57 -06:00
metalgearsloth
57858f802f Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
Emisse
3c028e4f4b remove turrets from nukies (#16757) 2023-05-24 10:54:47 +10:00
Scribbles0
0f33677c8c Barratry 2.5.6 + Raven Evac update (#16724)
* update 2.5.6 + raven stuff

* forgot the salvage vendors
2023-05-22 23:57:55 -06:00
Emisse
8b2f640623 [map] wizer update (#16469) 2023-05-15 11:40:28 -06:00
Emisse
9093cf6bc0 [map] pirate shuttle update (#16467) 2023-05-15 11:40:19 -06:00
metalgearsloth
7dba130454 Remove mapfile name + authors (#16264) 2023-05-09 18:09:57 +10:00
metalgearsloth
dcb10d4061 Fixture updates (#15254) 2023-05-06 16:26:15 +10:00
metalgearsloth
ac9970a50f Resave every map (#15964) 2023-05-02 11:38:01 +10:00
Nemanja
823c8204c9 Simplifying Machine Upgrading (#15802) 2023-04-29 13:23:49 +10:00
metalgearsloth
86bebbbb6e Add salvage shuttle (#15609) 2023-04-21 15:36:32 +10:00
Scribbles0
ea4a4a8358 [fix] lone ops fix (#15478) 2023-04-17 03:01:36 -06:00
Scribbles0
e24d0b4e44 [Antag] Lone Ops (#14647)
* loneops event, prototype stuff, striker shuttle, and nukeops rule changes

* newline

* shuttle attributions

* optimizations and tweaks

* bugfix and mutually exclusive with nukeops

* bugfix but better

* fix nukie planet spawning when defaulting to extended

* remove hypospray protection references

* ghost_roles.yml edit thingy

* remove .orig file
2023-04-17 00:00:43 -06:00
brainfood1183
8e817e2b97 pirate content (#11799)
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
Scribbles0
b410d4a233 Barratry:Evac+SkullUpdate (#15161) 2023-04-05 16:47:27 -06:00
metalgearsloth
f078be9c48 Mark escapepod as protected (#14914) 2023-03-27 19:04:43 -05:00
metalgearsloth
448165ffda Escape pods (#14809)
* Namespace adjustments for days

* pod

* thanks rider

* Fix the oop launch

* Fixes

* Fix stuff

* eeeeeeeee

* Fix

* access

* map

* forgor

* thing

* Genericise escape pod fill
2023-03-23 19:54:41 -06:00
metalgearsloth
f3a06a0696 Add arrivals (#14755)
* Arrivals

* More arrivals and shitty uhh preload

* cvar

* a

* clockin + maps

* shitter prevention

* Placement

* a

* cvar for tests and dev

* weh
2023-03-22 04:29:55 -05:00
Emisse
e402d28d3f siofjaosd (#14313) 2023-02-27 20:32:58 -06:00
Scribbles0
809959e21d Update Raven dock (#14311)
* update raven dock

* name
2023-02-27 18:48:15 -06:00
Scribbles0
d34d1ff02e NT Evac Raven (#14286)
* raven shuttle

* add missing blast door in sec compartment

* name

* extinguishers and emer lights
2023-02-27 17:43:55 -06:00
Emisse
68cba24dab Bagel Station Evac Shuttle Lox (#14307)
* proto

* mapfile

* posters n shit

* gyroscope oop
2023-02-27 15:17:52 -06:00
Emisse
86e8152fe6 Box Station Emergency Shuttle and Pill Update (#14201) 2023-02-21 19:22:54 +11:00
Emisse
3d329e5646 Evac shuttle big have name now its not unknown anymore it have name (#13761) 2023-01-28 09:57:10 -04:00
Checkraze
f253b86f04 dart 2.1 (#12764) 2023-01-20 06:21:16 -08:00
Checkraze
bf01bb6a6e Pirate shuttle update (#13126) 2023-01-19 03:02:47 -08:00
Checkraze
6f17b44366 wizard ship (#13373) 2023-01-18 01:09:50 -07:00
Emisse
05975606cf Big evac shuttle more firelocks (#13279) 2023-01-09 14:42:45 +11:00
metalgearsloth
c4b7e64c9e Update submodule to 0.68.0.0 (#12761) 2022-11-26 16:45:37 +11:00
Cheackraze
e7b68b5440 Courser Emergency Evacuation Shuttle (#12751)
* courser

* no sec fun
2022-11-25 02:18:17 -06:00
metalgearsloth
b09b7da92f Cleanup map files some more (#12375)
- Removed redundant prototype stuff for lights
- Removed forensics
2022-11-04 14:13:47 -05:00
metalgearsloth
4ef144d865 Content change from mass to density (#11533) 2022-10-04 15:48:23 +11:00
metalgearsloth
b29eeb7c16 Fix gamemap name casing (#11474) 2022-10-04 14:33:14 +11:00