Commit Graph

8752 Commits

Author SHA1 Message Date
Nadyr
6b1272698b Merge pull request #3020 from CHOMPStationBot/upstream-merge-11587
[MIRROR] [MIRROR] Map test 6 fixes
2021-09-24 17:15:13 -04:00
Nadyr
4584e40c24 Merge pull request #2994 from CHOMPStationBot/upstream-merge-11522
[MIRROR] Overhauls Resin ability, deletes unused xeno sprites, fixes few things.
2021-09-24 17:00:00 -04:00
Nadyr
38c5436e94 powder that makes you say yes 2021-09-24 16:50:08 -04:00
Nadyr
17bed21cec powder that makes you say yes 2021-09-24 16:49:42 -04:00
Nadyr
a9f1404052 powder that makes you say yes 2021-09-24 16:49:03 -04:00
Nadyr
b8e994566e powder that makes you say yes 2021-09-24 16:46:52 -04:00
Nadyr
18d722e310 powder that makes you say yes 2021-09-24 16:46:10 -04:00
Casey
5818890639 Merge pull request #11587 from VOREStation/upstream-merge-8286
[MIRROR] Map test 6 fixes
2021-09-24 03:59:48 +00:00
Chompstation Bot
5ca0ff4c15 Update mob spawners/spawns 2021-09-24 03:22:28 +00:00
Chompstation Bot
4dd3ea4d15 Overhauls Resin ability, deletes unused xeno sprites, fixes few things. 2021-09-24 03:19:02 +00:00
Razgriz
142bc1e4b9 Add files via upload 2021-09-21 01:53:26 -07:00
Razgriz
9fb9eb6eab Fix oldhotel.dmm map runtime
replaced /obj/random with /obj/random/single because /obj/random had null items.
2021-09-21 01:03:33 -07:00
Razgriz
e8505aa152 Remove flamethrower fuel from deadspy.dmm
This is so that runtimes will shut up about this runtime

[2021-09-21T00:58:51] Runtime in unsorted.dm,1447: Non movable passed to turf CanPass : 
  proc name: stack trace (/datum/proc/stack_trace)
  src: the rock (92,81,5) (/turf/simulated/mineral/sif)
  call stack:
  the rock (92,81,5) (/turf/simulated/mineral/sif): stack trace("Non movable passed to turf Can...")
  the rock (92,81,5) (/turf/simulated/mineral/sif): CanPass(null, the sand (91,81,5) (/turf/simulated/mineral/floor/ignore_mapgen), 0, 0)
  the flamethrower fuel (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel): Spread()
  the flamethrower fuel (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel): New(the sand (91,81,5) (/turf/simulated/mineral/floor/ignore_mapgen), 1, 0)
  the flamethrower fuel (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel): New(the sand (91,81,5) (/turf/simulated/mineral/floor/ignore_mapgen), 1, 0)
  /dmm_suite (/dmm_suite): create atom(/obj/effect/decal/cleanable/li... (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel), the sand (91,81,5) (/turf/simulated/mineral/floor/ignore_mapgen))
  /dmm_suite (/dmm_suite): instance atom(/obj/effect/decal/cleanable/li... (/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel), /list (/list), the sand (91,81,5) (/turf/simulated/mineral/floor/ignore_mapgen), 0, 0)
  /dmm_suite (/dmm_suite): parse grid("/obj/effect/decal/cleanable/li...", "c", 91, 81, 5, 0, 0)
  /dmm_suite (/dmm_suite): load map impl('maps/submaps/surface_submaps/m...', 90, 76, 5, 1, null, null, 0)
  /dmm_suite (/dmm_suite): load map('maps/submaps/surface_submaps/m...', 90, 76, 5, 1, null, null, 0)
  Spy Remains (/datum/map_template/surface/mountains/normal/deadspy): load(the rock (90,76,5) (/turf/simulated/mineral/sif), 1, 0)
  seed submaps(/list (/list), 15, /area/surface/cave/unexplored/... (/area/surface/cave/unexplored/normal), /datum/map_template/surface/mo... (/datum/map_template/surface/mountains/normal))
  Southern Cross (/datum/map/southern_cross): perform map generation()
  Mapping (/datum/controller/subsystem/mapping): Initialize(35307)
  Master (/datum/controller/master): Initialize(10, 0, 1)
2021-09-20 23:54:42 -07:00
Razgriz
ed2eba33a0 Merge pull request #2968 from Darlantanis/SpeedShuttle
Southern Cross STS shuttles reach max
2021-09-20 23:14:59 -07:00
Razgriz
362caffe59 Merge pull request #2798 from Rykka-Stormheart/shep-dev-compile-errors
Misc DMLang/VSCode Compiler Fixes + Some Actual Compiler Fixes
2021-09-17 03:15:52 -07:00
Rykka Stormheart
3d97e4626f Updates Southern Cross 7 (Expedition Carrier)
Removes faulty fueltank that was causing runtimes on game launch/load.
2021-09-16 22:40:45 -07:00
Darlantan
6466453a11 speeds up Southern Cross STS shuttles 2021-09-15 21:32:53 -04:00
Razgriz
51f78f0fb2 Fix getting stuck in z-level 13
Tested and works
2021-09-14 18:04:55 -07:00
Verkister
243a65fd7f Deck 3 maintenance fix
-Fixed Aft and Aft Port maintenance areas being both named Aft Starboard.
-Fixed missing APC on Aft area.
2021-09-05 19:22:18 +03:00
Rykka
2c6a698f00 Re-save Fuel Depot in TGM mode. (For Github Reading) 2021-09-03 17:24:29 -07:00
Rykka
f57efd4ed0 Fixes two compiler warnings thanks to help from Razgriz!
Fueldepot + Proteans. <3
2021-09-03 17:24:29 -07:00
Rykka
ed798113d9 Compiler Fixes
Fixes in order:
- Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:
![](https://i.imgur.com/8iCsb98.png)

- Fixes relative pathing in mecha_parts_ch.dm
- Fixes relative pathing in bodybag.dm
- Fixes relative pathing in sahoc_ch.dm
- Fixes relative pathing in toys_yw.dm
- Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm
- Fixes relative pathing in trash_pile_vr_ch.dm
- Fixes clip_mask being missing in misc_ch.dm
- Fixes relative pathing in tesh_synth_facemask.dm
- Fixes absolute path being indented in by one (typo?)
- Fixes relative pathing in armor_yw.dm
- Fixes unreachable parent call in audible_scream_ch.dm
- Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm
- Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm
- Fixes invalid kword nano_state in protean_blob.dm
- Fixes relative pathing in drone_manufacturer_unify.dm
- Fixes relative pathing in synx.dm
- Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm
- Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm
- Added include_robo = TRUE to fix argument missing in demon_ch.dm
- Fixes relative pathing in rakshasa_abilities.dm
- Adds comment to solargrub.dm, unable to fix operator overload error yet.
- Fixes relative pathing in sprite_accessories_extra_ch.dm
- Fixes relative pathing in sprite_accessories_yw.dm
- Fixes relative pathing in phase.dm
- Fixes relative pathing in bluespacecoffee.dm
- Fixes relative pathing in other_ch.dm
- Fixes relative pathing and ambigious ! in living_ch.dm
- Fixes relative pathing in custom_clothes_yw.dm
- Fixes relative pathing in custom_rigs_yw.dm
- Fixes relative pathing in MadokaSpear.dm
- Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
2021-09-03 17:22:49 -07:00
Razgriz
5e1185396b Merge pull request #2939 from Kazzc/MapFixes
Map fixes.
2021-09-03 17:13:21 -07:00
Duriel Levara
a8edf6e399 Adds a recycling room for Cargo
After testing it for quite a while, there are some minor issues with the recycling machines.
-Will not recycle trash.
-Will recycle some specific items, but if there is to much trash between the things it can recycle and what it can't, it will not recycle anything. (It will need to manually be unclogged)
-They do not consume power. (Tho I think they should)

I like the idea and I liked what mapped in for it, but this is essentially an extra step for Cargo to sort trash out. But I made sure to make it optional so if cargo players do not want to deal with recycling then now have an extra step of clicking the level 3 times to send it all to disposals. (Please forgive me for making you click 3 more times now)

Feedback will be appreciated, but I am indifferent if we should add this or not. . . I think the recycling machines need more code work to have it recycle more things and/or give some other basic materials than just steel. (Aka, cardoard, plastic, glass and so on from trash itself)

*SouthernCross Deck-2
-Expanded cargo and turned its small warehouse in to a hybrid warehouse/recycling facility.
-Added warning signs on Cargo.
-Removed a trash-pile that was cluttering Disposals
-Added a few Library and Gym signs on the halls by the civilian area.
2021-09-03 16:15:10 -04:00
Duriel Levara
02fabaefe5 Map fixes.
*FrostFold Outpost
-Fixed random terrain spots that had a roof
-Medical-bay. Fixed the compact defib to have a battery inside
*Sif Mine
-Added two more high capacity cells to make up for the lack of cells in the drills (Hopefully I can fix them to start with cells later. . .)
*SouthernCross Deck-3
-Added a new area for the auxiliary maint atmos room. (Hopefully this separates the large teshari room to being it's own area.)
-Added a riding crop on one of the taur dorms (Get kinky, you wipquashes)
2021-09-01 23:18:00 -04:00
Nadyr
9c4169499c powder that makes you say yes 2021-08-26 20:39:28 -04:00
Rykka
083298643c Fix failed mirror in listeningpost.dm
https://github.com/CHOMPStation2/CHOMPStation2/pull/1777

Mirror failed and left a HEAD/TAIL marking in listeningpost.dm

This fixes that. Niche, but it stalled out my compile on junglebase (And it will prevent stalling out if gateway is ever re-enabled). c:
2021-08-15 15:07:23 -07:00
Duriel Levara
6771d95557 Un-Casino 5.1 and fixes.
*Southern Cross Floor 2 z-level
-Slapped blob spawner landmark on the Gym
*FrostFold outpost z-level
-Removed casino relay
-Decorated frost tiles
-Added plating under the cooling pipes by the Rust Engine.
-Fixed missing cables by the abandoned sec-post
*Exploration Carrier z-level
-Fixed some atmos edges
*Central Command z-level
-Fixed conveyor belts on Cargo's shuttle.
*Transit z-level
-Fixed spacing for all transit ships, they is now more space between them and thus more visually pleasing.
(report any bugs)
2021-08-14 18:59:36 -04:00
Nadyr
c8ff410f64 Merge pull request #2790 from CHOMPStationBot/upstream-merge-11396
[MIRROR] Fix Salamanders and Wall-lockers
2021-08-13 23:46:21 -04:00
Nadyr
ec7731c220 Merge pull request #2789 from CHOMPStationBot/upstream-merge-11391
[MIRROR] Orange Line Upgrade
2021-08-13 23:40:51 -04:00
Nadyr
5eed3f3616 Merge pull request #2788 from CHOMPStationBot/upstream-merge-11384
[MIRROR] Virology Revamp
2021-08-13 23:40:19 -04:00
Nadyr
e9675a679e Merge pull request #2782 from CHOMPStation2/OvermapPOI
Add fuel depot to overmap
2021-08-13 23:13:27 -04:00
Nadyr
b758eaf0ba Merge pull request #2787 from CHOMPStationBot/upstream-merge-11392
[MIRROR] Fancy Lifeboats
2021-08-13 23:03:55 -04:00
Nadyr
44e37d3c50 prefix fix 2021-08-13 22:59:37 -04:00
Chompstation Bot
f5212e0053 Fix Salamanders and Wall-lockers 2021-08-13 15:40:58 +00:00
Chompstation Bot
9a5b473b22 Orange Line Upgrade 2021-08-13 15:39:53 +00:00
Chompstation Bot
beef8e7f82 Virology Revamp 2021-08-13 15:38:46 +00:00
Chompstation Bot
cbd1953061 Fancy Lifeboats 2021-08-13 15:38:40 +00:00
Razgriz
a53dc5fc80 Merge branch 'master' into OvermapPOI 2021-08-12 20:19:08 -07:00
Razgriz
04767aa9f1 Add fuel depot to overmap
Adds fuel depot to overmap. Its location will change in the future.
2021-08-12 20:17:51 -07:00
Razgriz
aae5d78046 QOL comments for maps 2021-08-12 15:57:03 -07:00
Chompstation Bot
ee735270ec Fancy exploration shuttle 2021-08-08 18:48:28 +00:00
Razgriz
40278c3bcd Merge pull request #2741 from CHOMPStationBot/upstream-merge-11341
[MIRROR] Fancy sprited shuttles
2021-08-07 15:13:48 -07:00
Razgriz
dc5d09737b Merge pull request #2743 from CHOMPStationBot/upstream-merge-11355
[MIRROR] Fix for Issue #11354
2021-08-06 22:29:53 -07:00
Aronai Sieyes
846f4e42d1 Merge pull request #11355 from GhostActual/fixitfixitfixit
Fix for Issue #11354
2021-08-06 22:16:01 +00:00
Chompstation Bot
2967ef4416 Fancy sprited shuttles 2021-08-06 22:15:49 +00:00
Aronai Sieyes
f5357b8eb2 Merge pull request #11353 from ResidentCody/keys-in-the-ATV
Keys In The ATV - That One ATV Can Have Its Battery Replaced Now
2021-08-06 14:48:44 +00:00
Nadyr
c1256426da Merge branch 'master' into upstream-merge-11324 2021-08-01 17:49:14 -04:00
Nadyr
f0d5ea81a4 Merge pull request #2710 from CHOMPStationBot/upstream-merge-10773
[MIRROR] [MIRROR] Adds optional area-based definition for outdoors-ness
2021-08-01 17:47:09 -04:00
Nadyr
049a8d1c10 powder that makes you say yes 2021-08-01 17:36:12 -04:00