mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-09 22:25:46 +01:00
5a68c5f6d3
* WE'RE SO BACK * LET THERE BE SOUND * More bugs * fixes * sound * hmm * clothing sprites + minor code changes to clothes * meestake * spritening * YARR * hiss * Cyberiad explorer remap * hand telover * delta days * rooms done * VENDOR * Mapping done * Salvage mapped * qol * Forgot the hivelord. * woops * oops redux * reviews and more * consistency * Update code/game/jobs/job_globals.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * the doorening * redooring * modsuit * more reviews * the plasmamamninigngg * add random salvage generation across space ruins * add blackbox tracking for salvage sold * gun * deconflicts and reviews * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * all conversations resolved * maybe work now? * please no more, too many apcs * Update code/modules/mob/living/simple_animal/corpse.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * PDA * conflicts * more conflicts * maybe all conflcits? * wait fuck * maybe fixed??? * KIDAN SPRITES * MAYBE? * access fixes * explorer hotfixes 1: - fixes space pirates dying in space - gives explorers ORM access - box: fixes access on NTR airlock - box: fixes naming on BS airlock - box: adds expedition access to mail sorting room * add salvage selling back * NOT FOR SALE * oh my god actually sell the fucking salvage this time * maybe fine now? * carpover * NO MORE CABLE * balance tweaks * some depot loot updates * merge conflict * deconflicted??? * woops more oversights * skirts, bombers, exploredrobe code + sprites * woops (again) * deconflicting * remove old explorer room again * Hat fix * minor changes to sprites and code for hats * yarrr fix 1 * first fixes * don't drop loot from syndies gibbed by depot destruction * add selling back with new signal based system * speedmerge this shit * minor changes to collars/bomber resprite * docking port in * ruins * WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN * no more murder hallway on whiteship * undelete meson sunglasses, redelete uristrunes * BOOTY BAGS * don't drop ashdrake loot from crusher kills * box: fix ntrep fax, add explorer access to ORMroom * add meson sunglasses item icon back * fix cere handtele, meta shutter control, death sound arg * cleaning up * she mosins on my russian till i dj station * Update code/modules/clothing/head/soft_caps.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
175 lines
9.4 KiB
Plaintext
175 lines
9.4 KiB
Plaintext
/area/hallway/secondary/construction : /area/station/public/construction
|
|
/area/construction : /area/station/public/construction
|
|
|
|
/area/atmos : /area/station/engineering/atmos
|
|
/area/atmos/control : /area/station/engineering/atmos/control
|
|
/area/atmos/distribution : /area/station/engineering/atmos/distribution
|
|
|
|
/area/bridge : /area/station/command/bridge
|
|
/area/bridge/meeting_room : /area/station/command/meeting_room
|
|
/area/crew_quarters/captain : /area/station/command/office/captain
|
|
/area/crew_quarters/captain/bedroom : /area/station/command/office/captain/bedroom
|
|
/area/crew_quarters/heads/hop : /area/station/command/office/hop
|
|
/area/crew_quarters/heads/hor : /area/station/command/office/rd
|
|
/area/crew_quarters/heads/chief : /area/station/command/office/ce
|
|
/area/crew_quarters/heads/hos : /area/station/command/office/hos
|
|
/area/crew_quarters/heads/cmo : /area/station/command/office/cmo
|
|
/area/crew_quarters/courtroom : /area/station/legal/courtroom
|
|
/area/crew_quarters/heads : /area/station/command/office/hop
|
|
/area/crew_quarters/hor : /area/station/command/office/rd
|
|
/area/crew_quarters/hos : /area/station/command/office/hos
|
|
/area/crew_quarters/chief : /area/station/command/office/ce
|
|
/area/server : /area/station/command/server
|
|
|
|
/area/ntrep : /area/station/command/office/ntrep
|
|
/area/blueshield : /area/station/command/office/blueshield
|
|
/area/centcomdocks : /area/centcom/docks
|
|
/area/crew_quarters : /area/station/public
|
|
/area/crew_quarters/toilet : /area/station/public/toilet
|
|
/area/crew_quarters/sleep_male : /area/station/public/sleep_male
|
|
/area/crew_quarters/sleep_male/toilet_male : /area/station/public/toilet/male
|
|
/area/crew_quarters/sleep_female : /area/station/public/sleep_female
|
|
/area/crew_quarters/sleep_female/toilet_female : /area/station/public/toilet/female
|
|
/area/crew_quarters/locker : /area/station/public/locker
|
|
/area/crew_quarters/locker/locker_toilet : /area/station/public/toilet/lockerroom
|
|
/area/crew_quarters/fitness : /area/station/public/fitness
|
|
/area/crew_quarters/dorms : /area/station/public/dorms
|
|
/area/crew_quarters/arcade : /area/station/public/arcade
|
|
/area/crew_quarters/cafeteria : /area/station/service/cafeteria
|
|
/area/crew_quarters/kitchen : /area/station/service/kitchen
|
|
/area/crew_quarters/bar : /area/station/service/bar
|
|
/area/crew_quarters/bar/atrium : /area/station/service/bar/atrium
|
|
/area/crew_quarters/theatre : /area/station/service/theatre
|
|
/area/crew_quarters/mrchangs : /area/station/public/mrchangs
|
|
/area/crew_quarters/cafe : /area/station/service/cafeteria
|
|
/area/crew_quarters/recreation : /area/station/public/recreation
|
|
|
|
/area/library : /area/station/service/library
|
|
/area/chapel : /area/station/service/chapel
|
|
/area/chapel/main : /area/station/service/chapel
|
|
/area/chapel/office : /area/station/service/chapel/office
|
|
/area/lawoffice : /area/station/legal/lawoffice
|
|
/area/magistrateoffice : /area/station/legal/magistrate
|
|
/area/clownoffice/@SUBTYPES : /area/station/service/clown/@SUBTYPES
|
|
/area/mimeoffice : /area/station/service/mime
|
|
/area/civilian/barber : /area/station/service/barber
|
|
/area/civilian/clothing : /area/station/public/clothing
|
|
/area/civilian/pet_store : /area/station/public/pet_store
|
|
|
|
/area/engine : /area/station/engineering
|
|
/area/engine/engine_smes : /area/station/engineering/smes
|
|
/area/engine/engineering : /area/station/engineering/control
|
|
/area/engine/break_room : /area/station/engineering/break_room
|
|
/area/engine/equipmentstorage : /area/station/engineering/equipmentstorage
|
|
/area/engine/hardsuitstorage : /area/station/engineering/hardsuitstorage
|
|
/area/engine/controlroom : /area/station/engineering/controlroom
|
|
/area/engine/gravitygenerator : /area/station/engineering/gravitygenerator
|
|
/area/engine/chiefs_office : /area/station/command/office/ce
|
|
/area/engine/supermatter : /area/station/engineering/engine/supermatter
|
|
/area/solar/@SUBTYPES : /area/station/engineering/solar/@SUBTYPES
|
|
|
|
/area/teleporter : /area/station/command/teleporter
|
|
/area/teleporter/quantum/@SUBTYPES : /area/station/public/quantum/@SUBTYPES
|
|
|
|
/area/medical : /area/station/medical
|
|
/area/medical/medbay : /area/station/medical/medbay
|
|
/area/medical/medbay2 : /area/station/medical/medbay2
|
|
/area/medical/medbay3 : /area/station/medical/medbay3
|
|
/area/medical/biostorage : /area/station/medical/storage
|
|
/area/medical/reception : /area/station/medical/reception
|
|
/area/medical/psych : /area/station/medical/psych
|
|
/area/medical/medbreak : /area/station/medical/break_room
|
|
/area/medical/patients_rooms : /area/station/medical/patients_rooms
|
|
/area/medical/ward : /area/station/medical/ward
|
|
/area/medical/patient_a : /area/station/medical/isolation/a
|
|
/area/medical/patient_b : /area/station/medical/isolation/b
|
|
/area/medical/patient_c : /area/station/medical/isolation/c
|
|
/area/medical/iso_access : /area/station/medical/isolation
|
|
/area/medical/coldroom : /area/station/medical/coldroom
|
|
/area/medical/cmo : /area/station/command/office/cmo
|
|
/area/medical/cmostore : /area/station/medical/storage/secondary
|
|
/area/medical/robotics : /area/station/science/robotics
|
|
/area/medical/research : /area/station/science/research
|
|
/area/medical/scibreak : /area/station/science/break_room
|
|
/area/medical/virology : /area/station/medical/virology
|
|
/area/medical/virology/lab : /area/station/medical/virology/lab
|
|
/area/medical/morgue : /area/station/medical/morgue
|
|
/area/medical/chemistry : /area/station/medical/chemistry
|
|
/area/medical/surgery : /area/station/medical/surgery
|
|
/area/medical/surgery1 : /area/station/medical/surgery/primary
|
|
/area/medical/surgery2 : /area/station/medical/surgery/secondary
|
|
/area/medical/surgeryobs : /area/station/medical/surgery/observation
|
|
/area/medical/cryo : /area/station/medical/cryo
|
|
/area/medical/exam_room : /area/station/medical/exam_room
|
|
/area/medical/genetics : /area/station/science/genetics
|
|
/area/medical/genetics_cloning : /area/station/medical/cloning
|
|
/area/medical/sleeper : /area/station/medical/sleeper
|
|
/area/medical/paramedic : /area/station/medical/paramedic
|
|
|
|
/area/security/interrogation : /area/station/security/interrogation
|
|
/area/security/seceqstorage : /area/station/security/storage
|
|
/area/security/checkpoint2 : /area/station/security/checkpoint/secondary
|
|
/area/security/interrogationobs : /area/station/security/interrogation/observation
|
|
/area/security/armoury : /area/station/security/armory
|
|
/area/security/securearmoury : /area/station/security/armory/secure
|
|
/area/security/hos : /area/station/command/office/hos
|
|
/area/security/detectives_office : /area/station/security/detective
|
|
/area/security/nuke_storage : /area/station/command/vault
|
|
/area/security/vacantoffice : /area/station/public/vacant_office
|
|
/area/security/vacantoffice2 : /area/station/public/vacant_office
|
|
/area/security/customs : /area/station/command/customs
|
|
/area/security/customs2 : /area/station/command/customs2
|
|
/area/security/courtroomdandp : /area/station/legal/courtroom/dap
|
|
|
|
/area/janitor : /area/station/service/janitor
|
|
/area/hydroponics : /area/station/service/hydroponics
|
|
/area/hydroponics/abandoned_garden : /area/station/maintenance/abandoned_garden
|
|
|
|
/area/toxins/explab_chamber : /area/station/science/explab/chamber
|
|
/area/toxins/lab : /area/station/science/rnd
|
|
/area/toxins/test_area : /area/station/science/toxins/test
|
|
/area/toxins/launch : /area/station/science/toxins/launch
|
|
/area/toxins/mixing : /area/station/science/toxins/mixing
|
|
/area/toxins/server_coldroom : /area/station/science/server/coldroom
|
|
|
|
/area/assembly/chargebay : /area/station/science/robotics/chargebay
|
|
/area/assembly/showroom : /area/station/science/robotics/showroom
|
|
/area/assembly/robotics : /area/station/science/robotics
|
|
/area/assembly/assembly_line : /area/station/maintenance/assembly_line
|
|
|
|
/area/storage : /area/station/public/storage
|
|
/area/storage/tools : /area/station/public/storage/tools/auxiliary
|
|
/area/storage/primary : /area/station/public/storage/tools
|
|
/area/storage/autolathe : /area/station/public/storage/autolathe
|
|
/area/storage/art : /area/station/public/storage/art
|
|
/area/storage/auxillary : /area/station/ai_monitored/storage/eva
|
|
/area/storage/eva : /area/station/ai_monitored/storage/eva
|
|
/area/storage/secure : /area/station/engineering/secure_storage
|
|
/area/storage/emergency : /area/station/public/storage/emergency
|
|
/area/storage/emergency2 : /area/station/public/storage/emergency/port
|
|
/area/storage/tech : /area/station/engineering/tech_storage
|
|
/area/storage/office : /area/station/public/storage/office
|
|
|
|
/area/ai_monitored : /area/station/ai_monitored
|
|
/area/ai_monitored/storage/eva : /area/station/ai_monitored/storage/eva
|
|
/area/ai_monitored/storage/secure : /area/station/ai_monitored/storage/secure
|
|
|
|
|
|
/area/turret_protected/ai_upload_foyer : /area/station/turret_protected/ai_upload/foyer
|
|
/area/turret_protected/aisat_interior : /area/station/turret_protected/aisat/interior
|
|
/area/turret_protected/aisat_interior/secondary : /area/station/turret_protected/aisat/interior/secondary
|
|
/area/turret_protected/@SUBTYPES : /area/station/turret_protected/@SUBTYPES
|
|
|
|
/area/bridge/hall : /area/station/hallway/secondary/bridge{@OLD}
|
|
|
|
/area/expedition : /area/station/supply/expedition
|
|
|
|
/area/security/@SUBTYPES : /area/station/security/@SUBTYPES{@OLD}
|
|
/area/quartermaster/@SUBTYPES : /area/station/supply/@SUBTYPES{@OLD}
|
|
/area/maintenance/@SUBTYPES : /area/station/maintenance/@SUBTYPES{@OLD}
|
|
/area/hallway/@SUBTYPES : /area/station/hallway/@SUBTYPES{@OLD}
|
|
/area/crew_quarters/sleep/@SUBTYPES : /area/station/public/sleep/@SUBTYPES
|
|
/area/tcommsat/@SUBTYPES : /area/station/telecomms/@SUBTYPES{@OLD}
|
|
/area/toxins/@SUBTYPES : /area/station/science/@SUBTYPES{@OLD}
|
|
/area/aisat/@SUBTYPES : /area/station/aisat/@SUBTYPES{@OLD}
|