Commit f9f6ad8
Updating Cynosure branch to compile on current Neb dev.
Work on getting the Cynosure map to playable state. This is a squash of multiple commits, important changes are listed below:
- Fixes roundstart power, and in general improves the power system by using a code-defined SMES presets for each function. Modifies SMES code to not include an extra coil in every SMES.
- Fixes networking/telecommunications. Currently has a form of small room next to the Site Administrator's office (where SA's private bathroom was) with all the necessary equipment. This may be relocated to a more permanent place in the future. Also maps in bunch of relays all around the station (these are like WiFi antennas for pretty much everything)
- Copies over telecommunication channels from the Exodus map (may be modified in the future, if needed). Radios now work.
- Removes the telecommunications satellite Z level altogether, as it is completely incompatible with the new networking and radio system.
- Fixes inability to late-join by mapping in Arrivals landmarks. Currently not using the original moving shuttle, instead you spawn next to the airlock where the shuttle docked.
- Reactor cold loop is no longer 'accidentally' connected to the station's distribution loop via a misplaced valve. While this was indeed a very innovative and effective central heating solution, staff has complained of 1000°C air coming out of vents.
- Drops outdoor temperature to -5°C
- Refactors all on-station areas to follow a common naming scheme - /area/cynosure/(type/department)/(floor)/(area name)
- Replace substation scrubber valves with open variants
- Fix leaking pipes in Research, which tripped the shutoff valves
- Fix probably all airlocks on the station
- Fix/Setup the Cargo, Emergency and Escape Pod shuttles.
Area permissions, new areas icons (#2)
* Fixed secure access for all departments, added new access operator: Opion to unsecure areas inside secure areas
* Added missing new icon file
* fixed access for jobs, added job overrides for cynosure
* fixed access merge
* fixed prison access
* Merged job overrides to one file
Ore box + Unloader fix
- Fix unloader not updating ore box on-examine contents when removing ores
- Tweak ore box examine to skip ores that have 0 pieces contained in the box.
Assorted cynosure map fixes
- Fix miners not having access to their own locker room
- Remapped refinery room to use the new machines
- Added assorted circuit boards to tech storage
- Fix atmospherics holding tank computers as well as the supermatter computer not being linked to their vents/injectors/sensors.
Fixed signs and lights (#3)
Shutter and button fixes (#4)
* Fixed signs and lights
* Shutter fixes, directional signs fixes, surgery holosign fixes, blast door button fixes
Updating Cynosure to compile on current Neb.
Co-authored-by: Atlantis <[email protected]>
Co-authored-by: woody41 <[email protected]>1 parent e5acc4e commit f9f6ad8
File tree
149 files changed
+415893
-434
lines changed- code
- __defines
- game
- area
- jobs
- machinery
- atmoalter
- doors
- objects
- items
- circuitboards/machinery
- devices/radio
- robot
- random/subtypes
- structures
- signs
- turfs/unsimulated
- modules
- atmospherics/components
- binary_devices
- maps
- materials/stack_types
- mining
- machinery
- mob/living/silicon/robot
- paperwork
- power
- projectiles/ammunition
- unit_tests
- icons
- clothing
- accessories/badges
- rigs/ert/ia
- obj/signs
- maps
- antag_spawn/ert
- away
- bearcat
- casino
- derelict
- unishi
- cynosure
- datums
- supplypacks
- icons
- items
- job
- loadout
- overmap
- structures
- closets
- signs
- submaps
- 10x9
- 16x11
- 5x7
- 7x7
- 8x5
- 8x9
- 9x10
- 9x8
- exodus
- ministation
- tradeship
- mods/content
- corporate
- icons/clothing/accessories
- items
- government/away_sites/icarus
- polaris
- turfs
- standard_jobs/departments
- tools/map_migrations
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
149 files changed
+415893
-434
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
28 | 27 | | |
29 | 28 | | |
30 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
61 | 67 | | |
62 | 68 | | |
63 | 69 | | |
| |||
268 | 274 | | |
269 | 275 | | |
270 | 276 | | |
271 | | - | |
272 | | - | |
273 | | - | |
274 | | - | |
275 | | - | |
276 | | - | |
277 | 277 | | |
278 | 278 | | |
279 | 279 | | |
| |||
310 | 310 | | |
311 | 311 | | |
312 | 312 | | |
313 | | - | |
314 | | - | |
315 | | - | |
316 | | - | |
317 | | - | |
318 | | - | |
319 | 313 | | |
320 | 314 | | |
321 | 315 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1123 | 1123 | | |
1124 | 1124 | | |
1125 | 1125 | | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
| 1131 | + | |
| 1132 | + | |
| 1133 | + | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
89 | 90 | | |
90 | 91 | | |
91 | 92 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
| 52 | + | |
51 | 53 | | |
52 | 54 | | |
53 | 55 | | |
| |||
207 | 209 | | |
208 | 210 | | |
209 | 211 | | |
| 212 | + | |
| 213 | + | |
210 | 214 | | |
211 | 215 | | |
212 | 216 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
574 | 574 | | |
575 | 575 | | |
576 | 576 | | |
| 577 | + | |
| 578 | + | |
577 | 579 | | |
578 | 580 | | |
579 | 581 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
481 | 481 | | |
482 | 482 | | |
483 | 483 | | |
| 484 | + | |
| 485 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
| 23 | + | |
22 | 24 | | |
23 | 25 | | |
24 | 26 | | |
| |||
289 | 291 | | |
290 | 292 | | |
291 | 293 | | |
292 | | - | |
| 294 | + | |
293 | 295 | | |
294 | 296 | | |
295 | 297 | | |
| |||
327 | 329 | | |
328 | 330 | | |
329 | 331 | | |
330 | | - | |
| 332 | + | |
331 | 333 | | |
332 | 334 | | |
333 | 335 | | |
| |||
600 | 602 | | |
601 | 603 | | |
602 | 604 | | |
603 | | - | |
604 | | - | |
605 | | - | |
606 | 605 | | |
607 | 606 | | |
608 | 607 | | |
0 commit comments