Roidstation Initial Commit (#19124)

* Uploading maps.

Updated RoidstationBD.dmm to add Courtroom/Central Sec Checkpoint. Also includes revisions to overall layout.

Library fine-tuned. Brig added, making good progress but needs the basic infastructure (wiring, pipes, lights) and some elements still missing.

Added Science division and much of the Z-Level for the station, including the Perma and Voxpost. Also now includes a more finalized Sec.

Further revision to Sci

Updating file name - also added Cargo and fleshed out Mining/Xenoarch/Sci.

Filled in Arrivals and Science

BurntFork's medbay included in Roidstation.dmm file. Added areas.

Updated Sec Airlock (thanks SonixApache). This is the version with Medbay as well.

Updated the Gulag.

Added Engineering, cut outs for tcomms, AI Core, Upload, and incorporated Medbay, Dorms, and Chapel. Most areas are now defined.

Fleshed out engineering some more - added SME, AME, Atmos, and parts of Auxiliary Engineering.

Added AI Core, Upload, Vault, Tcomms, Xenobiology. Now sealed and ready for testing.

Added EVA, Janitor's Closet, Vacant Office, multiple outer roids, Theater. Started to define roids as areas.

Added some supplies to EVA.

Added wiring for a good chunk of the station.

Finished off most of the wiring, added cameras, marked all roids as areas, added syndieship docking spots - still need auxiliary docking at Arrivals or Escape.

To do: Piping (Air supply, Disposals, and Scrubbers)
Playtest for cameras

Redesigned Security, corrected wiring. Also includes numerous fixes by BurntFork. Added Auxiliary Docking Ports.

Added mining waystations, numerous bugfixes from playtest.

Choppiness should be gone thanks to DamianQ. Will need to go through and see if any nudged objects need to be readjused.

More bugfixes. More piping.

Added David, the best Goliath on the Roid.

Added door to the MoMMI nest.

Wiring and piping is now 90% complete. This version is ready for playtesting.

Still needed: Disposals and thorough QA testing.

Playtest-capable map

Adds simulated asteroid turfs and xenoarch exemption for mineral sites. (#1)

Playtest Map (Upload Attempt 1)

Updated Maps. RoidStationTEST is playtestable and should feature Ghetto Engineering and numerous bugfixes as well as working atmos.

Incl. bugfixes and replaced pipes from today's playtest.

Updating Taxi file

Updated filenames (Roidstation is now the default map) and also fixed Taxistation's missing component.

Lots more fixes to vents. Virology is now rebuilt.

Updated .dm file to reflect map name change.

added Magmaws to the TEG.

Backup Map

Revert "Backup Map"

This reverts commit 7b800af78d93aaa919f377824e62ba25d1ec7e28.

More vent fixes and started to flesh out disposals. Grudgingly expanded HoP office by 1 row of tiles due to lack of space. Added Custodial Closet to Arrivals Hall. Magmaws in TEG.

This file should work now.

Numerous fixes from tonight's playtest. Expanded TEG/Hydroponics slightly.

Medbay Redesigned to please the insolent, unruly peasants.

Medbay rework complete. Engineering slightly renovated. Fixed some pipes, confirmed that Mining/Sci doors work.

Includes fixes for Privacy Shutters

Updated files for the rad-shielded Morgue in Medbay.

Redesigned telecomms. Also includes a few fixes to pods and some other small fixes.

Disposals piping should be mostly done now. Probably fucked up, but it's there.

Some fixes to Disposals. This is the latest file.

Fixed a bug in the Xenoarcheology file that was messing up the compilation.

Thanks to Burneddi, Disposals should now be complete. Still pending testing. I've gone through and fixed our problem with vox tiles in maintenance and replaced them all wholesale, so our air problems should be fixed.

Disposals fixes, ran the map through the map merger (#2)

...unfortunately the map merger doesn't do its magic the first time it's ran, so this commit is still unnecessarily huge.

Fix maintenance tunnels and asteroid turfs (#3)

All asteroid turfs around the station are now special turfs that don't spawn ores or xenoarchaeology artifacts, and produce a simulated asteroid turf when mined (simulated turfs work with atmospherics), allowing players to dig to expand the station.

Cosmetic medbay fixes

Fixes to maintenance and science.
Connects the disconnected science maintenance tunnels to the main maintenance tunnel.
Moves science shuttle down slightly and creates a shuttle bay for it.
Add an intercom to the RD office.
Fixed broken piping and wiring into the borer hatching room.
Added xenobio containment areas to the xenobio containment cells (there were only 6 areas but 7 cells, so two cells are merged into one area).

Removed superfluous mulebot delivery port

Moved a misplaced AI screen in the science shuttle bay and added some clutter to the maintenance nearby.

Further work on the science area maintenance.
Xenobiology has been moved closer to the main station, and is now connected by
a makeshift maintenance tunnel. This means it no longer needs separate power or
atmospherics (through its scrubbers still feed directly into space rather than
the main scrubber system).

Fleshed out maintenance a little more.

Made ghetto surgery a bit prettier.

Revert "Minor ghetto surgery tweaks"

Adding custom areas include.
Added a new include, /roidstation/areas.dm, to roidstation.dm
This include defines custom areas for use on Roidstation when the Boxstation
area template doesn't quite match our layout.

Finished most of the work for this target.
Committing before starting work on maintenance airlock permissions.

Fixed access requirements on maintenance and exterior airlocks.
For the most part, at least.

fixed some broken piping in secure storage

Permabrig solars. Xenobio solars removed as they are now redundant and would always be in shadow anyway.
The permabrig solars should get light from the south for about a third of the day or so, which hopefully is enough to power it because no engineer is going to go all the way out there, and turning on the pacmans is below security.

Permabrig solars area fix.

Manually merged the ghetto surgery change.

Added missing newline to the end of areas.dm

piping fixes and stuff

More fixes. Pipes STILL fucked.

More pipes work. they still fucked tho.

Merged in atmos area, wizden+syndieshuttle changes from botched repo.
Pending bridge rework(?), and fixing atmosia.

Atmospherics overhaul. Engineering fixes. Miscellaneous fixes. Oh boy.

Removed leftover mapping copypaste shit.

Smoking is now allowed behind the O2 and plasma tanks in atmos.

fixed some air alarm freqs in the crashed vox ship south of atmos

Moved gas miners one tile further back as QoL change for engineers.

Fixed missing fire/air alarms, APCs, etc. all around the station. Should be all of them.

Miscellaneous window-related fixes all over.

Pipes fixed, finally. Misc. fixes all around the station.

Various toilet-related fixes.

Cameras are officially DONE. Fixed up some minor shit like areas while I was at it.

Manually merged #19047.

Fixed some hallway door names.

Added RoidStation to mapmerger scripts. Changed .gitattributes to not convert line endings in .bat files.

Fixed SME and TEG coolant loops (Osseus)

added two can dispensers to secure storage. removed one from atmospherics.

Removed some unnecessary changes.

Reverting the STUBBORN vgstation13.dme

Removing camera.dm from PR.

Merge pull request #4 from GeneralVeers25/Roidgym

Roidgym

Reverted box bridge reworks.

Reverted box bridge reworks for real this time.

Removed the leftover atmospherics pipes used as mapping aid.

* Removed unnecessarily modified files from this PR.

* - Removed misplaced air alarm from Paramedic station.
- Removed misplaced defib charger from Paramedic station.
- Fixed sofas in the hallway next to chapel.
- Added an extra light to the Bar backroom.
- Moved Cargo bay camera slightly.
- Removed duplicate AI cards and adjusted AI card positions.
- Fixed access on brig medbay windoor.
- Added extra lights to MoMMI nest.
- Fixed area definitions on Z-3.
- Dave, who was called David, is now a Dave.
- Fixed a bunch of orphaned and misplaced vents and scrubbers.
- Fixed several instances of disposals pipes running underneath walls where they didn't have to.
- Rerouted some disposals pipes to utilize the aft port maintenance tunnels.

 Adds davids and Dave, roidstation's mascot.  (#19026)

* Tweaks robot access, again.

* Adds davids and Dave, roidstation's mascot.

* Revert "Tweaks robot access, again."

This reverts commit 7d458f09b3.

* New desc by @DrSlimes

* Adds dave to the blacklisted mob list

* Copypasted over the clown roid from Box because there was no bananium on the map. It's on Z-6.

* Made the disposals external disposals pipe not run inside the roid while I was at it.

* Updated Hydroponics to include the Ranch and made some more minor fixes to maint. Added external airlocks to Engineering.

* Replaced an airlock in engineering with a prettier one.

* added a bunsen burner to chemistry
This commit is contained in:
GeneralVeers25
2018-08-07 14:10:18 -04:00
committed by jknpj
parent a79c4eb52c
commit ea5fe9a31e
13 changed files with 16569 additions and 3 deletions

5
.gitattributes vendored
View File

@@ -8,4 +8,7 @@
*.dmi merge=merge-dmi
# force changelog merging to use union
html/changelog.html merge=union
html/changelog.html merge=union
# keep .bat file line endings LF
*.bat text eol=crlf

View File

@@ -1484,6 +1484,11 @@ proc/process_adminbus_teleport_locs()
name = "\improper Morgue"
icon_state = "morgue"
/area/medical/coldstorage
name = "Morgue"
icon_state = "morgue"
//for Roidstation - this area is radshielded.
/area/medical/chemistry
name = "Chemistry"
icon_state = "chem"

View File

@@ -10,7 +10,8 @@
/area/security/brig,
/area/shuttle,
/area/vox_station,
/area/syndicate_station
/area/syndicate_station,
/area/medical/coldstorage,
)

View File

@@ -26,6 +26,7 @@
var/mineral_overlay
var/mined_type = /turf/unsimulated/floor/asteroid
var/overlay_state = "rock_overlay"
var/no_finds = 0 //whether or not we want xenoarchaeology stuff here
var/rockernaut = NONE
@@ -50,6 +51,18 @@
temperature = T20C
mined_type = /turf/unsimulated/floor/asteroid/air
//These walls produce a simulated floor tile for easy interior area expansion (Roidstation)
//they also can't contain xenoarch sites
/turf/unsimulated/mineral/internal
no_finds = 1
mined_type = /turf/simulated/floor/asteroid
/turf/unsimulated/mineral/internal/air
oxygen = MOLES_O2STANDARD
nitrogen = MOLES_N2STANDARD
temperature = T20C
mined_type = /turf/simulated/floor/asteroid/air
/turf/unsimulated/mineral/hive
mined_type = /turf/unsimulated/floor/evil
@@ -547,6 +560,108 @@ turf/unsimulated/mineral/ChangeTurf(var/turf/N, var/tell_universe=1, var/force_l
//icon_plating = "asteroid_dug"
update_icon()
//***Simulated version of asteroid floors for use inside of stations (roidstation)***
/turf/simulated/floor/asteroid
name = "Asteroid"
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
intact = 0
oxygen = 0.01
nitrogen = 0.01
temperature = TCMB
plane = PLATING_PLANE
var/dug
var/sand_type = /obj/item/weapon/ore/glass
/turf/simulated/floor/asteroid/air
oxygen = MOLES_O2STANDARD
nitrogen = MOLES_N2STANDARD
temperature = T20C
/turf/simulated/floor/asteroid/New()
..()
qdel(floor_tile)
floor_tile = null
name = initial(name)
if(prob(20))
icon_state = "asteroid[rand(0,12)]"
icon_regular_floor = initial(icon_state)
/turf/simulated/floor/asteroid/is_plating()
return 0
/turf/simulated/floor/asteroid/canBuildCatwalk()
return BUILD_FAILURE
/turf/simulated/floor/asteroid/canBuildLattice()
if(src.x >= (world.maxx - TRANSITIONEDGE) || src.x <= TRANSITIONEDGE)
return BUILD_FAILURE
else if (src.y >= (world.maxy - TRANSITIONEDGE || src.y <= TRANSITIONEDGE ))
return BUILD_FAILURE
else if(!(locate(/obj/structure/lattice) in contents))
return BUILD_SUCCESS
return BUILD_FAILURE
/turf/simulated/floor/asteroid/canBuildPlating()
if(src.x >= (world.maxx - TRANSITIONEDGE) || src.x <= TRANSITIONEDGE)
return BUILD_FAILURE
else if (src.y >= (world.maxy - TRANSITIONEDGE || src.y <= TRANSITIONEDGE ))
return BUILD_FAILURE
else if(!dug)
return BUILD_IGNORE
if(locate(/obj/structure/lattice) in contents)
return BUILD_SUCCESS
return BUILD_FAILURE
/turf/simulated/floor/asteroid/ex_act(severity)
switch(severity)
if(3.0)
return
if(2.0)
if (prob(70))
gets_dug()
if(1.0)
gets_dug()
/turf/simulated/floor/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(!W || !user)
return 0
if (istype(W, /obj/item/weapon/pickaxe))
var/obj/item/weapon/pickaxe/used_digging = W //cast for dig speed and flags
if (get_turf(user) != user.loc) //if we aren't somehow on the turf we're in
return
if(!(used_digging.diggables & DIG_SOIL)) //if the pickaxe can't dig soil, we don't
to_chat(user, "<span class='rose'>You can't dig soft soil with \the [W].</span>")
return
if (dug)
to_chat(user, "<span class='rose'>This area has already been dug.</span>")
return
to_chat(user, "<span class='rose'>You start digging.<span>")
playsound(src, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better
if(do_after(user, src, used_digging.digspeed) && user) //the better the drill, the faster the digging
playsound(src, 'sound/items/shovel.ogg', 50, 1)
to_chat(user, "<span class='notice'>You dug a hole.</span>")
gets_dug()
else
..(W,user)
return
/turf/simulated/floor/asteroid/update_icon()
if(dug && ispath(sand_type, /obj/item/weapon/ore/glass))
icon_state = "asteroid_dug"
/turf/simulated/floor/asteroid/proc/gets_dug()
if(dug)
return
for(var/i = 1 to 5)
new sand_type(src)
dug = 1
//icon_plating = "asteroid_dug"
update_icon()
/turf/unsimulated/mineral/random
name = "Mineral deposit"
var/mineralSpawnChanceList = list(

View File

@@ -4,9 +4,10 @@
proc/SetupXenoarch()
for(var/turf/unsimulated/mineral/M in mineral_turfs)
if(!prob(XENOARCH_SPAWN_CHANCE))
if(M.no_finds || !prob(XENOARCH_SPAWN_CHANCE))
continue
var/digsite = get_random_digsite_type()
var/list/processed_turfs = list()
var/list/turfs_to_process = list(M)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

16227
maps/RoidStation.dmm Normal file

File diff suppressed because it is too large Load Diff

39
maps/roidstation.dm Normal file
View File

@@ -0,0 +1,39 @@
//**************************************************************
// Map Datum -- Roidstation
//**************************************************************
/datum/map/active
nameShort = "roid"
nameLong = "Asteroid Station"
map_dir = "roidstation"
tDomeX = 128
tDomeY = 58
tDomeZ = 2
zLevels = list(
/datum/zLevel/station,
/datum/zLevel/centcomm,
/datum/zLevel/space{
name = "spaceOldSat" ;
},
/datum/zLevel/space{
name = "derelict" ;
},
/datum/zLevel/mining,
/datum/zLevel/space{
name = "spacePirateShip" ;
},
)
enabled_jobs = list(/datum/job/trader)
load_map_elements = list(
/datum/map_element/dungeon/holodeck
)
holomap_offset_x = list(0,0,0,86,4,0,0,)
holomap_offset_y = list(0,0,0,94,10,0,0,)
////////////////////////////////////////////////////////////////
#include "defficiency/pipes.dm" // Atmos layered pipes.
#include "roidstation/areas.dm"
#include "roidstation.dmm"

167
maps/roidstation/areas.dm Normal file
View File

@@ -0,0 +1,167 @@
//**New areas**
/area/crew_quarters/holocontrol
name = "Holodeck Control"
icon_state = "holocontrol"
/area/maintenance/apmaint2
name = "Aft Port Maintenance"
icon_state = "apmaint"
/area/maintenance/starboard2
name = "Starboard Maintenance"
icon_state = "smaint"
/area/engineering/aux_storage
name = "Engineering Auxiliary Storage"
icon_state = "engine_storage"
/area/engine/magma_engine
name = "Magma Engine Room"
icon_state = "thermo_engine"
/area/maintenance/prisonsolar
name = "Prison Solar Maintenance"
icon_state = "SolarcontrolA"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
/area/solar/prison
name = "\improper Prison Solar Array"
icon_state = "panelsA"
/area/derelict/bar
name = "Derelict Bar"
icon_state = "bar"
/area/derelict/holodeck
name = "Derelict Holodeck"
icon_state = "Holodeck"
/area/tcomms/storage2
name = "Telecoms Auxiliary Storage"
icon_state = "primarystorage"
/area/hallway/primary/central/toilet
name = "Central Primary Hallway Toilets"
icon_state = "toilet"
/area/hallway/primary/fore/toilet
name = "Fore Primary Hallway Toilets"
icon_state = "toilet"
/area/prison/hallway/central
name = "\improper Prison Central Hallway"
icon_state = "yellow"
/area/prison/cell_block/hydroponics
name = "Prison Jail Hydroponics"
icon_state = "brig"
/area/prison/lockers
name = "\improper Prison Equipment Storage"
icon_state = "security"
/area/prison/armory
name = "\improper Prison Armory"
icon_state = "security"
/area/prison/engineering
name = "\improper Prison Engineering"
icon_state = "storage"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
/area/prison/tcomms
name = "\improper Prison Telecomms"
icon_state = "ai"
holomap_filter = HOLOMAP_FILTER_STATIONMAP_STRATEGIC
/area/science/xenobiology/specimen_0
name = "\improper Xenobiology Test Chamber"
icon_state = "xenocell1"
/area/turret_protected/ai_integrity
name = "AI Integrity Restoration Room"
icon_state = "ai_upload"
/area/turret_protected/aisat_tele
name = "AI Satellite Teleporter"
icon_state = "ai"
/area/turret_protected/aisat_borg
name = "Cyborg Station"
icon_state = "ai"
//**Renamed areas**
/area/mine/lobby
name = "Mining Lobby"
/area/mine/production
name = "Mining Material Processing"
/area/research_outpost/xenobot
name = "Xenobotany Lab"
/area/research_outpost/hallway
name = "Research Wing Hallway"
/area/engine/storage
name = "Engineering Lockers"
/area/prison/cell_block/A
name = "Prison Jail"
/area/security/toilet
name = "Security Office Toilets"
/area/turret_protected/aisat_interior
name = "\improper AI Satellite Foyer"
icon_state = "ai_foyer"
//*******Areas from Defficiency*******
/area/maintenance/vault
name = "Vault Maintenance"
icon_state = "vaultmaint"
/area/derelictparts/fsderelict
name = "Fore Starboard Derelict"
icon_state = "fsderelict"
/area/derelictparts/asderelict
name = "Aft Starboard Derelict"
icon_state = "asderelict"
/area/derelictparts/apderelict
name = "Aft Port Derelict"
icon_state = "apderelict"
/area/derelictparts/fore
name = "Fore Derelict"
icon_state = "fderelict"
/area/derelictparts/port
name = "Port Derelict"
icon_state = "pderelict"
/area/derelictparts/aft
name = "Aft Derelict"
icon_state = "aderelict"
/area/derelictparts/library
name = "Abandoned Library"
icon_state = "libraryderelict"
/area/derelictparts/stripclub
name = "Abandoned Strip Club"
icon_state = "stripclubderelict"
/area/derelictparts/diner
name = "Abandoned Diner"
icon_state = "dinerderelict"
/area/derelictparts/incinerator
name = "Abandoned Incinerator"
icon_state = "incineratorderelict"
/area/derelictparts/medbay
name = "Abandoned Medbay"
icon_state = "medbayderelict"

View File

@@ -3,6 +3,7 @@ set MAPFILE_EFF=defficiency.dmm
set MAPFILE_MS=metaclub.dmm
set MAPFILE_PCK=packedstation.dmm
set MAPFILE_BAG=bagelstation.dmm
set MAPFILE_ROID=RoidStation.dmm
cd ../maps
copy %MAPFILE_TG% %MAPFILE_TG%.backup
@@ -10,5 +11,6 @@ copy %MAPFILE_EFF% %MAPFILE_EFF%.backup
copy %MAPFILE_MS% %MAPFILE_MS%.backup
copy %MAPFILE_PCK% %MAPFILE_PCK%.backup
copy %MAPFILE_BAG% %MAPFILE_BAG%.backup
copy %MAPFILE_ROID% %MAPFILE_ROID%.backup
pause

View File

@@ -3,6 +3,7 @@ export MAPFILE_EFF=defficiency.dmm
export MAPFILE_MS=metaclub.dmm
export MAPFILE_PCK=packedstation.dmm
export MAPFILE_BAG=bagelstation.dmm
export MAPFILE_ROID=RoidStation.dmm
cd ../maps
@@ -11,3 +12,4 @@ cp $MAPFILE_EFF $MAPFILE_EFF.backup
cp $MAPFILE_MS $MAPFILE_MS.backup
cp $MAPFILE_PCK $MAPFILE_PCK.backup
cp $MAPFILE_BAG $MAPFILE_BAG.backup
cp $MAPFILE_ROID $MAPFILE_ROID.backup

View File

@@ -3,11 +3,13 @@ set MAPFILE_EFF=defficiency.dmm
set MAPFILE_MS=metaclub.dmm
set MAPFILE_PCK=packedstation.dmm
set MAPFILE_BAG=bagelstation.dmm
set MAPFILE_ROID=RoidStation.dmm
java -jar MapPatcher.jar -clean ../maps/%MAPFILE_TG%.backup ../maps/%MAPFILE_TG% ../maps/%MAPFILE_TG%
java -jar MapPatcher.jar -clean ../maps/%MAPFILE_EFF%.backup ../maps/%MAPFILE_EFF% ../maps/%MAPFILE_EFF%
java -jar MapPatcher.jar -clean ../maps/%MAPFILE_MS%.backup ../maps/%MAPFILE_MS% ../maps/%MAPFILE_MS%
java -jar MapPatcher.jar -clean ../maps/%MAPFILE_PCK%.backup ../maps/%MAPFILE_PCK% ../maps/%MAPFILE_PCK%
java -jar MapPatcher.jar -clean ../maps/%MAPFILE_BAG%.backup ../maps/%MAPFILE_BAG% ../maps/%MAPFILE_BAG%
java -jar MapPatcher.jar -clean ../maps/%MAPFILE_ROID%.backup ../maps/%MAPFILE_ROID% ../maps/%MAPFILE_ROID%
pause

View File

@@ -3,11 +3,13 @@ export MAPFILE_EFF=defficiency.dmm
export MAPFILE_MS=metaclub.dmm
export MAPFILE_PCK=packedstation.dmm
export MAPFILE_BAG=bagelstation.dmm
export MAPFILE_ROID=RoidStation.dmm
java -jar MapPatcher.jar -clean ../maps/$MAPFILE_TG.backup ../maps/$MAPFILE_TG ../maps/$MAPFILE_TG
java -jar MapPatcher.jar -clean ../maps/$MAPFILE_EFF.backup ../maps/$MAPFILE_EFF ../maps/$MAPFILE_EFF
java -jar MapPatcher.jar -clean ../maps/$MAPFILE_MS.backup ../maps/$MAPFILE_MS ../maps/$MAPFILE_MS
java -jar MapPatcher.jar -clean ../maps/$MAPFILE_PCK.backup ../maps/$MAPFILE_PCK ../maps/$MAPFILE_PCK
java -jar MapPatcher.jar -clean ../maps/$MAPFILE_BAG.backup ../maps/$MAPFILE_BAG ../maps/$MAPFILE_BAG
java -jar MapPatcher.jar -clean ../maps/$MAPFILE_ROID.backup ../maps/$MAPFILE_ROID ../maps/$MAPFILE_ROID
read -n1 -r -p "Press any key to continue..." key