Various fixes and more GB tweaks

This commit is contained in:
Casey
2022-04-04 15:25:56 -04:00
committed by CHOMPStation2
parent c08fe46e9a
commit 168d6eb12d
9 changed files with 122139 additions and 3 deletions

View File

@@ -341,4 +341,105 @@
<h2>Part 3: Closing Remarks</h2> <h2>Part 3: Closing Remarks</h2>
<p>This all may seem daunting at a glance; so many recipes to learn, and a "lot" to keep in mind. But really it's not - tending the Bar is mostly about going with the flow of things and providing a good times, and drinks just provide liquid courage to make a good time easier. Take a deep breath if you ever feel overwhelmed, and handle one order at a time. You can do it! Don't feel the need to know every recipe, just learn your favorites and go from there; the rest is here or online if someone asks for it! If somebody asks you to give them anything without a specific request, don't panic: evalulate their likes and tolerance level, and try your best to give them something nice!</p> <p>This all may seem daunting at a glance; so many recipes to learn, and a "lot" to keep in mind. But really it's not - tending the Bar is mostly about going with the flow of things and providing a good times, and drinks just provide liquid courage to make a good time easier. Take a deep breath if you ever feel overwhelmed, and handle one order at a time. You can do it! Don't feel the need to know every recipe, just learn your favorites and go from there; the rest is here or online if someone asks for it! If somebody asks you to give them anything without a specific request, don't panic: evalulate their likes and tolerance level, and try your best to give them something nice!</p>
</body> </body>
</html> "} <<<<<<< HEAD
</html> "}
=======
</html> "}
/obj/item/weapon/book/manual/rotary_electric_generator
name = "Rotary Electric Generator Manual"
icon_state ="rulebook"
item_state = "book15"
author = "Engineering Encyclopedia"
title = "Rotary Electric Generator Manual"
/obj/item/weapon/book/manual/rotary_electric_generator/New()
..()
dat = {"<html>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
h2 {font-size: 15px; margin: 15px 0px 5px;}
h3 {font-size: 13px; margin: 15px 0px 5px;}
li {margin: 2px 0px 2px 15px;}
ul {margin: 5px; padding: 0px;}
ol {margin: 5px; padding: 0px 15px;}
body {font-size: 13px; font-family: Verdana;}
</style>
</head>
<body>
Technical Order (TO) 1-33-34-2 <br>
<h1>Operator's Manual - Rotary Electric Generator, D-Type</h1><br><br>
Supporting Data: <br>
- TO 1-33-34-4-1 Illustrated Parts Breakdown - Rotary Electric Generator, D-Type <br>
- TO 1-33-34-6 Inspection Work Cards - Rotary Electric Generator, D-Type <br><br>
Support Equipment: <br>
- Torque Wrench, 100-80,000 inch-pounds <br>
- Composite Tool Kit, Standard <br>
- Multitool with Lead Kit, Wire Kit <br> <br>
Required Supplies: <br>
- stainless steel, 10,000cm3 <br>
- lubrication, petrolatum, 6000ml <br>
- electrical wiring, 5m <br>
- component set, capacitors (any grade) <br>
- circuitry board, REG <br> <br>
<h1>SETUP AND OPERATING PROCEDURES</h1> <br> <br>
Setup: <br> <br>
CAUTION: Do not remove too much air from the work space or personnel may be exposed to hypoxia or similar effects. <br> <br>
1. Prepare setup area. Remove machinery, debris, foreign objects, people, and extra air. <br> <br>
2. Lay out preliminary electrical wiring. <br>
2a. Connect electrical wiring to existing facility power grid. <br>
2b. Work wiring into shape as defined in TO 1-33-34-4-1 Figure 32 Index 6. <br>
3. Prepare gathered steel supplies as defined in TO 1-33-34-4-1 Figure 2 Index 3. <br>
4. Assemble prepared steel supplies into equipment framework by inserting rod A into slot B. Refer to TO 1-33-34-4-1 Figure 1 Index 1 for technical drawings. <br>
4a. Secure assembled equipment framework to flooring by tightening lower frame bolts. <br> <br>
5. Install and secure circuitry board, REG-D into marked receptacle. <br> <br>
6. Install electrical wiring. Refer to TO 1-33-34-4-1 Figure 666 Index 6 thru Index 90 for routing. <br> <br>
7. Install capacitors into marked circuitry board slots. Do not force components into place, use even pressure. Do not use a hammer. <br> <br>
<b>WARNING</b>: Assembly will rapidly inflate when finalization is triggered. Ensure personnel and equipment are clear before initiating. <br> <br>
8. Finalize construction by turning the Initialize Finalization screw on the outer housing. <br> <br>
9. Wait for assembly to finish inflating, and the unit is ready for service. <br> <br>
Operating Procedures: <br> <br>
NOTE: Operation of REG-D type generators requires significant physical effort. Ensure users are provided adequare nutrition and hydration throughout the working period. <br> <br>
1. Designate the individual who will be operating the REG-D. <br> <br>
2. Provide a safety briefing regarding nutritional preparedness and physical ability. <br> <br>
NOTE: Stretching is highly recommended before and after any operation session. <br> <br>
3. Operator shall board the REG-D track body and ensure there are no unsecured objects on the path. <br> <br>
4. Once ready, Operator may begin running at own pace. Do not sprint. Maintain an even pace and proper running form for optimal energy generation. <br> <br>
5. Continue to run on the REG-D track body until sufficient energy is stored in systems or Operator is no longer able or willing to continue. <br> <br>
6. To end a session, carefully lower forward running speed until the track body comes to a complete stop, then disembark the REG-D. <br> <br>
REFER TO TO 1-33-34-6 FOR MAINTENANCE AND INSPECTION PROCEDURES
</body>
</html>
"}
>>>>>>> c10812a251... Merge pull request #12635 from Very-Soft/gbtweaks

View File

@@ -20,13 +20,13 @@
/turf/simulated/floor/flesh /turf/simulated/floor/flesh
name = "flesh" name = "flesh"
desc = "This slick flesh ripples and squishes under your touch" desc = "This slick flesh ripples and squishes under your touch"
icon_state = "flesh-floor" icon_state = "flesh_floor"
icon = 'icons/turf/stomach_vr.dmi' icon = 'icons/turf/stomach_vr.dmi'
/turf/simulated/floor/flesh/colour /turf/simulated/floor/flesh/colour
name = "flesh" name = "flesh"
desc = "This slick flesh ripples and squishes under your touch" desc = "This slick flesh ripples and squishes under your touch"
icon_state = "colorable-floor" icon_state = "c_flesh_floor"
icon = 'icons/turf/stomach_vr.dmi' icon = 'icons/turf/stomach_vr.dmi'
/turf/simulated/floor/flesh/attackby() /turf/simulated/floor/flesh/attackby()

View File

@@ -0,0 +1,7 @@
/turf/simulated/floor/holofloor/flesh
name = "flesh"
desc = "This slick flesh ripples and squishes under your touch"
icon = 'icons/turf/stomach_vr.dmi'
icon_state = "flesh_floor"
base_icon_state = "flesh_floor"
initial_flooring = null

23047
maps/groundbase/gb-misc.dmm Normal file

File diff suppressed because it is too large Load Diff

38881
maps/groundbase/gb-z1.dmm Normal file

File diff suppressed because it is too large Load Diff

36980
maps/groundbase/gb-z2.dmm Normal file

File diff suppressed because it is too large Load Diff

22696
maps/groundbase/gb-z3.dmm Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,423 @@
/area/groundbase
name = "Groundbase"
icon = 'icons/turf/areas_vr.dmi'
icon_state = "blublacir"
requires_power = TRUE
dynamic_lighting = TRUE
ambience = AMBIENCE_RUINS
base_turf = /turf/simulated/mineral/floor/virgo3c
/area/maintenance/groundbase
name = "Maintenance"
icon = 'icons/turf/areas_vr.dmi'
icon_state = "purblasqu"
flags = RAD_SHIELDED
ambience = AMBIENCE_RUINS
flags = AREA_FLAG_IS_NOT_PERSISTENT
base_turf = /turf/simulated/mineral/floor/virgo3c
/area/groundbase/level1
name = "Rascal's Pass Level 1"
flags = AREA_FLAG_IS_NOT_PERSISTENT
/area/groundbase/level1/ne
name = "Northeast Rascal's Pass Level 1"
/area/groundbase/level1/nw
name = "Northwest Rascal's Pass Level 1"
/area/groundbase/level1/se
name = "Southeast Rascal's Pass Level 1"
/area/groundbase/level1/sw
name = "Southwest Rascal's Pass Level 1"
/area/groundbase/level1/centsquare
name = "\improper Central Square"
/area/groundbase/level1/northspur
name = "\improper North Spur"
/area/groundbase/level1/eastspur
name = "\improper East Spur"
/area/groundbase/level1/westspur
name = "\improper West Spur"
/area/groundbase/level1/southeastspur
name = "\improper Southeast Spur"
/area/groundbase/level1/southwestspur
name = "\improper Southwest Spur"
/area/groundbase/level2
name = "Rascal's Pass Level 2"
flags = AREA_FLAG_IS_NOT_PERSISTENT
/area/groundbase/level2/ne
name = "Northeast Rascal's Pass Level 2"
/area/groundbase/level2/nw
name = "Northwest Rascal's Pass Level 2"
/area/groundbase/level2/se
name = "Southeast Rascal's Pass Level 2"
/area/groundbase/level2/sw
name = "Southwest Rascal's Pass Level 2"
/area/groundbase/level2/northspur
name = "\improper North Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/eastspur
name = "\improper East Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/westspur
name = "\improper West Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/southeastspur
name = "\improper Southeast Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level2/southwestspur
name = "\improper Southwest Spur"
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3
name = "Rascal's Pass Level 3"
flags = AREA_FLAG_IS_NOT_PERSISTENT
/area/groundbase/level3/ne
name = "Northeast Rascal's Pass Level 3"
/area/groundbase/level3/ne/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3/nw
name = "Northwest Rascal's Pass Level 3"
/area/groundbase/level3/nw/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3/se
name = "Southeast Rascal's Pass Level 3"
/area/groundbase/level3/se/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3/sw
name = "Southwest Rascal's Pass Level 3"
/area/groundbase/level3/sw/open
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/level3/escapepad
name = "Escape Shuttle Landing Pad"
/area/groundbase/science
name = "Science"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/science/hall
name = "Science Hallway"
/area/groundbase/science/rnd
name = "Research and Development"
/area/groundbase/science/robotics
name = "Rocotics"
/area/groundbase/science/server
name = "Science Server Room"
/area/groundbase/science/rd
name = "Research Director's Office"
/area/groundbase/science/circuits
name = "Circuits Workshop"
/area/groundbase/science/xenohall
name = "Xeno Studies Hallway"
/area/groundbase/science/xenobot
name = "Xenobotany"
/area/groundbase/science/xenobot/storage
name = "Xenobotany Storage"
/area/groundbase/science/picnic
name = "Science Break Room"
/area/groundbase/command
name = "Command"
holomap_color = HOLOMAP_AREACOLOR_COMMAND
icon_state = "bluwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/command/bridge
name = "Bridge"
/area/groundbase/command/captain
name = "Captain's Office"
/area/groundbase/command/captainq
name = "Captain's Quarters"
/area/groundbase/command/hop
name = "Head of Personnel"
/area/groundbase/command/hall
name = "Command Hallway"
/area/groundbase/command/meeting
name = "Command Meeting Room"
/area/groundbase/command/ai
name = "AI Core"
ambience = AMBIENCE_AI
/area/groundbase/command/ai/chamber
name = "AI Chamber"
/area/groundbase/command/ai/upload
name = "AI Upload"
/area/groundbase/command/ai/hall
name = "AI Hall"
/area/groundbase/command/ai/foyer
name = "AI Foyer"
/area/groundbase/command/ai/robot
name = "Robot Storage"
/area/groundbase/command/ai/storage
name = "AI Storage"
/area/groundbase/security
name = "Security"
holomap_color = HOLOMAP_AREACOLOR_SECURITY
icon_state = "redwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/security/lobby
name = "Security Lobby"
/area/groundbase/security/processing
name = "Security Processing"
/area/groundbase/security/halls
name = "Security South Hallway"
/area/groundbase/security/halle
name = "Security East Hallway"
/area/groundbase/security/warden
name = "Warden's Office"
/area/groundbase/security/armory
name = "Security Armory"
ambience = AMBIENCE_HIGHSEC
/area/groundbase/security/briefing
name = "Security Briefing Room"
/area/groundbase/security/equipment
name = "Security Equipment Room"
ambience = AMBIENCE_HIGHSEC
/area/groundbase/security/iaa1
name = "Internal Affairs West Office"
/area/groundbase/security/iaa2
name = "Internal Affairs East Office"
/area/groundbase/security/detective
name = "Detective's Office"
/area/groundbase/security/hos
name = "Head of Security's Office"
/area/prison/cell_block/gb
name = "Brig"
/area/groundbase/medical
name = "Medical"
holomap_color = HOLOMAP_AREACOLOR_MEDICAL
icon_state = "cyawhisqu"
/area/groundbase/medical/lobby
name = "Medical Lobby"
/area/groundbase/medical/psych
name = "Psychiatrist's Office"
/area/groundbase/medical/Chemistry
name = "Chemistry"
/area/groundbase/medical/triage
name = "Medical Triage"
/area/groundbase/medical/lhallway
name = "Medical Lower Hallway"
/area/groundbase/medical/resleeving
name = "Resleeving"
/area/groundbase/medical/autoresleeving
name = "Auto-Resleeving"
/area/groundbase/medical/or1
name = "Medical Operating Room 1"
/area/groundbase/medical/or2
name = "Medical Operating Room 2"
/area/groundbase/medical/equipment
name = "Medical Equipment Room"
/area/groundbase/medical/office
name = "Medical Office"
/area/groundbase/medical/uhallway
name = "Medical Upper Hallway"
/area/groundbase/medical/cmo
name = "Chief Medical Officer's Office"
/area/groundbase/medical/paramedic
name = "Paramedic Equipment Room"
/area/groundbase/medical/patio
name = "Medical Break Room"
/area/groundbase/medical/patient1
name = "Medical Patient Room 1"
/area/groundbase/medical/patient2
name = "Medical Patient Room 2"
/area/groundbase/medical/patient3
name = "Medical Patient Room 3"
/area/groundbase/medical/patient4
name = "Medical Patient Room 4"
/area/groundbase/medical/morgue
name = "Morgue"
/area/groundbase/engineering
name = "Engineering"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhisqu"
ambience = AMBIENCE_ENGINEERING
/area/groundbase/engineering/lobby
name = "Engineering Lobby"
/area/groundbase/engineering/ce
name = "Chief Engineer's Office"
/area/groundbase/engineering/workshop
name = "Engineering Workshop"
/area/groundbase/engineering/eva
name = "Engineering EVA"
/area/groundbase/engineering/storage
name = "Engineering Storage"
/area/groundbase/engineering/techstorage
name = "Engineering Tech Storage"
/area/groundbase/engineering/engine
name = "Engine"
/area/groundbase/engineering/atmos
name = "Atmospherics"
ambience = AMBIENCE_ATMOS
/area/groundbase/engineering/atmos/monitoring
name = "Atmospherics Monitoring"
/area/groundbase/cargo
name = "Cargo"
holomap_color = HOLOMAP_AREACOLOR_CARGO
icon_state = "orawhisqu"
ambience = AMBIENCE_HANGAR
/area/groundbase/cargo/office
name = "Cargo Office"
/area/groundbase/cargo/bay
name = "Cargo Bay"
/area/groundbase/cargo/bay/above
base_turf = /turf/simulated/open/virgo3c
/area/groundbase/cargo/qm
name = "Quartermaster's Office"
/area/groundbase/cargo/mining
name = "Mining"
/area/maintenance/groundbase/trashpit
name = "Trash Pit"
/area/groundbase/civilian
name = "Civilian"
holomap_color = HOLOMAP_AREACOLOR_CIV
icon_state = "grewhisqu"
ambience = AMBIENCE_FOREBODING
/area/groundbase/civilian/arrivals
name = "Arrivals"
/area/groundbase/civilian/toolstorage
name = "Tool Storage"
/area/groundbase/civilian/bar
name = "Bar"
/area/groundbase/civilian/hydroponics
name = "Hydroponics"
/area/groundbase/civilian/hydroponics/out
name = "Hydroponics Animal Pen"
/area/groundbase/civilian/kitchen
name = "Kitchen"
/area/groundbase/civilian/kitchen/freezer
name = "Kitchen Freezer"
/area/groundbase/civilian/kitchen/backroom
name = "Kitchen Back Room"
/area/groundbase/civilian/chapel
name = "Chapel"
ambience = AMBIENCE_CHAPEL
/area/groundbase/civilian/chapel/office
name = "Chaplain's Office"
/area/groundbase/civilian/library
name = "Library"
/area/groundbase/civilian/pilot
name = "Pilot Equipment Room"
/area/groundbase/civilian/gateway
name = "Gateway"
/area/groundbase/civilian/janitor
name = "Janitor's Closet"
/area/groundbase/civilian/foodplace
name = "Uncle Grumslex's Snack Emporium"
/area/groundbase/civilian/apparel
name = "Crew Apparel Care"
/area/groundbase/civilian/clown
name = "Giggledome"
/area/groundbase/civilian/mime
name = "Temple of Silence"
/area/groundbase/exploration
name = "Exploration"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/exploration/equipment
name = "Exploration Equipment Room"
/area/groundbase/exploration/shuttlepad
name = "Exploration Shuttlepad"
/area/groundbase/dorms
name = "Dormitories"
holomap_color = HOLOMAP_AREACOLOR_DORMS
icon_state = "grawhisqu"
flags = RAD_SHIELDED | BLUE_SHIELDED
ambience = AMBIENCE_GENERIC
/area/groundbase/dorms/bathroom
name = "Dormitory Bathroom"
/area/groundbase/dorms/room1
name = "Dorm Room 1"
/area/groundbase/dorms/room2
name = "Dorm Room 2"
/area/groundbase/dorms/room3
name = "Dorm Room 3"
/area/groundbase/dorms/room4
name = "Dorm Room 4"
/area/groundbase/dorms/room5
name = "Dorm Room 5"
/area/groundbase/dorms/room6
name = "Dorm Room 6"
/area/groundbase/dorms/room7
name = "Dorm Room 7"
/area/groundbase/dorms/room8
name = "Dorm Room 8"
/area/maintenance/groundbase/substation
name = "Substation"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhitri"
ambience = AMBIENCE_SUBSTATION
/area/maintenance/groundbase/substation/medcargo
name = "Medical/Cargo Substation"
/area/maintenance/groundbase/substation/secsci
name = "Security/Research Substation"
/area/maintenance/groundbase/substation/aiciv
name = "AI/Civilian Substation"
/area/maintenance/groundbase/substation/command
name = "Command Substation"
/area/maintenance/groundbase/level1/netunnel
name = "\improper Level 1 Northeast Tunnel"
/area/maintenance/groundbase/level1/nwtunnel
name = "\improper Level 1 Northwest Tunnel"
/area/maintenance/groundbase/level1/setunnel
name = "\improper Level 1 Southeast Tunnel"
/area/maintenance/groundbase/level1/stunnel
name = "\improper Level 1 South Tunnel"
/area/maintenance/groundbase/level1/swtunnel
name = "\improper Level 1 Southwest Tunnel"
/area/groundbase/mining
name = "Mining"
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg')
/area/groundbase/mining/unexplored
icon_state = "orablacir"
/area/groundbase/mining/explored
icon_state = "blublacir"
// Exclude some more areas from the atmos leak event since its outside.
/datum/event/atmos_leak/setup()
excluded |= /area/groundbase/level1/centsquare
excluded |= /area/groundbase/level1/eastspur
excluded |= /area/groundbase/level1/northspur
excluded |= /area/groundbase/level1/southeastspur
excluded |= /area/groundbase/level1/southwestspur
excluded |= /area/groundbase/level1/westspur
excluded |= /area/maintenance/groundbase/level1/netunnel
excluded |= /area/maintenance/groundbase/level1/nwtunnel
excluded |= /area/maintenance/groundbase/level1/stunnel
excluded |= /area/maintenance/groundbase/level1/setunnel
excluded |= /area/maintenance/groundbase/level1/swtunnel
excluded |= /area/groundbase/level2/ne
excluded |= /area/groundbase/level2/nw
excluded |= /area/groundbase/level2/se
excluded |= /area/groundbase/level2/sw
excluded |= /area/groundbase/level3/ne
excluded |= /area/groundbase/level3/nw
excluded |= /area/groundbase/level3/se
excluded |= /area/groundbase/level3/sw
excluded |= /area/groundbase/level2/northspur
excluded |= /area/groundbase/level2/eastspur
excluded |= /area/groundbase/level2/westspur
excluded |= /area/groundbase/level2/southeastspur
excluded |= /area/groundbase/level2/southwestspur
excluded |= /area/groundbase/level3/ne/open
excluded |= /area/groundbase/level3/nw/open
excluded |= /area/groundbase/level3/se/open
excluded |= /area/groundbase/level3/sw/open
excluded |= /area/groundbase/level3/escapepad
..()

View File

@@ -2513,6 +2513,7 @@
#include "code\modules\ghosttrap\trap.dm" #include "code\modules\ghosttrap\trap.dm"
#include "code\modules\holodeck\HolodeckControl.dm" #include "code\modules\holodeck\HolodeckControl.dm"
#include "code\modules\holodeck\HolodeckObjects.dm" #include "code\modules\holodeck\HolodeckObjects.dm"
#include "code\modules\holodeck\HolodeckObjects_vr.dm"
#include "code\modules\holodeck\HolodeckPrograms.dm" #include "code\modules\holodeck\HolodeckPrograms.dm"
#include "code\modules\holomap\generate_holomap.dm" #include "code\modules\holomap\generate_holomap.dm"
#include "code\modules\holomap\holomap_area.dm" #include "code\modules\holomap\holomap_area.dm"