cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

493 Commits

Author SHA1 Message Date
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Razgriz
f1dd2f5386 Area rollback 
Removed areas that have been removed from the map, but keeping this file as a placeholder.
 2020-01-02 05:55:45 -07:00
TheFurryFeline
d191dc6b88 Mapfix Palooza Round One 
Changelog Notes:

- Removes random SMES in maints mapped in for Research.

- Rearranges items in HOS Office and adds gear closet with weapon power cell. Also re-add NSFW gun that was commented out.

- Add AR-B glasses to CD Office and plain AR glasses to HOP.

- Add missing shortwave radios to the bridge.

- OR rooms rearranged.

- - Anasthetic wall pumps added.

- - Anasthetic wall closets removed.

- - Surgery tools, table, monitor, IV drips moved.

- - Add anesthetic floor-based closets as a reserve.

- - Minor increase in area size.

- Exploration rewards vendor moved to explorer areas on outpost. Deletes the one in Research wall. Also rearranges spawnpoints for explorers on the surface.

- Add medical access to field medic section at Main Outpost FA Station.

- Add Mining redemption vendor. Resolves #28

- Moves lights in several places to not be in the same spot as cameras.

- Fixes APCs at Xenoresearch being turned off as well as access into the sub-department. Also removes exploration vendor.

- Internal second button added in engine room for going in and out of the SMES room.

- Mech Bay shutter name fix. Was labelled Mining Storage.

- Fixes blindspots for cameras.

- Railings for hangar bays for safety reasons.

- Door access fixes.

- - Remove access restrictions on FA Stations.

- - Fix access for Red Armoury preventing HOS entry.

- - Fix access for surface teleporter room preventing RD entry.

- Gives Armoury what it had for Northern Star.

- Dorm additions and tweaks.

- - Space dorms on deck 1 added so everyone doesn't have to go straight to the surface for private fun.

- - Locks added to heads' bedrooms on deck 3.

- - Moves an antag thingy out of the way to the west side of deck 1.

- Increases main power SMES energy amount.

- Remove extra AI Status Display Monitor in QM Office.
 2019-12-31 19:22:13 -05:00
RadiantFlash7
885025be77 map fixes 
Adds some rad shelters on the mining z level,
Ensures all small maint pockets are rad hsielded, Fixes some access issues in differant places.
 2019-12-26 20:30:05 -05:00
RadiantFlash7
5c89274a93 Shuttle datums 
Adds shuttle Datums
Shuttle Areas
 2019-10-31 20:33:17 -04:00
RadiantFlash7
64afd0f3df Icepick, exploration polish, shuttle areas, etc 
Adds ice pick sprites, Polishes Exploration vessel,
Adds some fluf in form of board.
Fixes all holodecks for main holodeck.
Adds trader shuttle LZ, and ERT shuttle LZ to cryogaia.
Adds Vox raider LZ's, and 1/4 of Syndi shuttle LZs.
Adds new yellow trailblazers.
Finishes up atmos and power in exploration wing.
 2019-10-30 00:53:45 -04:00
RadiantFlash7
d57a9847c6 Disposals, snow, power, exploration 
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
fixes merge conflict as well.
 2019-10-27 15:07:48 -04:00
RadiantFlash7
86e4d8a316 Revert "Revert "Revert "Disposals, exploration, snow fixes""" 
This reverts commit ad78add3d0.
 2019-10-27 14:00:53 -04:00
RadiantFlash7
ad78add3d0 Revert "Revert "Disposals, exploration, snow fixes"" 
This reverts commit 0f66788181.
 2019-10-27 13:57:41 -04:00
RadiantFlash7
0f66788181 Revert "Disposals, exploration, snow fixes" 
This reverts commit 16e7b75d0b.
 2019-10-27 13:56:35 -04:00
RadiantFlash7
16e7b75d0b Disposals, exploration, snow fixes 
Exploration WIP
Fixes trail blazers
Finishes up disposals
Fixes power lines being wrong directional via sprite.
Fixes areas, and snow tiles to be simulated and outdoors.
 2019-10-27 13:19:06 -04:00
Hawk_v3
74cc210e21 Merge remote-tracking branch 'server/master' into map 2019-10-05 23:10:09 +01:00
RadiantFlash7
06ef275fef Adds 2 new sound effects and map stuff 
Updated map stuff. Mostly done, needs Disposals piping, and some more spawn points in the snow for mobs.
Also requires testing for halls/lightings.
Zlevels still broke.
Deletes the old maps\test\ version of cryogaia.
 2019-10-05 17:47:33 -04:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Mewchild
7d0b236abf Moves tether_midpoint area 2019-09-16 23:35:40 -05:00
Mewchild
a4f6613019 Remakes the entire tether midpoint 2019-09-16 22:27:22 -05:00
Hawk_v3
b6ebecf7ec Merge remote-tracking branch 'upstream/master' 2019-08-30 21:38:17 +01:00
Spades
9882dc85f4 Merge pull request #5729 from TheFurryFeline/TFF_Tether_Areas_Spring_Cleaning 
Cleanup of Areas Placement
 2019-08-30 07:42:20 -04:00
TheFurryFeline
73f9a0d2df Please, Travis.... 
One additional attempt to get travis to cooperate...
 2019-08-28 16:41:53 -04:00
TheFurryFeline
3ea538b217 Shush, Travis 
More error fixing that don't show up in DM.
 2019-08-28 15:36:47 -04:00
TheFurryFeline
11627e943f Fix Rogueminer_vr 
Errors popped up in Travis that didn't show on DM. Thank you... Fixing the screechuing, I hope.
 2019-08-28 15:14:43 -04:00
TheFurryFeline
c068e984f7 Cleanup of Areas Placement 
On the tin, moves all areas from Space Station 13 areas_vr.dm and puts it in tether_areas2.dm
 2019-08-28 13:37:20 -04:00
Heroman
819d211b23 Fixes power not updating when shuttle moves 2019-08-28 18:21:52 +10:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Heroman
03510c6d1b Redesigns exploration, moves chapel and AI 2019-04-23 05:10:43 +10:00
RadiantFlash7
0955f28c34 Mapping updates+multi-z issue 
Renamed maps in attempt to get z levels working. Zlevel is still super broke, For some reason Setting the z level in cryogaia_defines isn't working. Could use help with this.
 2019-04-19 17:25:29 -04:00
Hawk_v3
d893b2dd24 Merge branch 'master' into map 2019-04-14 20:07:12 +01:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Hawk_v3
8d868fb890 Merge branch 'map' into RadiantMaster 2019-04-14 18:27:05 +01:00
Neerti
098f8851ad Arrivals Power Fix 2019-04-13 17:34:31 -04:00
RadiantFlash7
fd32189505 Major Map overhaul 
Cargo finalized
Security rework #5 Done.
Maintence fleshed out,
...Security reword #6 started,
Escape hall added in progress,
added centcom z level for transit arrival/departure shuttles along with centcom.
Copied tether.dm files over to /yw map folder for proper custom map compiling. (required for planets to function)
Recoded Planetary atmos to use O2, Super cold O2, and weather to be harsher.
Added a buncha areas to differant mapping z levels, still a lot more to go.
New titlescreen for our server by an artist.
 2019-04-12 19:11:48 -04:00
Heroman
148511e6b0 Fixes some issues with BSH 2019-04-08 16:34:36 +10:00
Repede
e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme
 2019-04-07 19:40:12 -04:00
Heroman
7f53eb35c3 Provides proper shielding to areas meant to be shielded 2019-04-05 05:13:35 +10:00
Atermonera
131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
Heroman3003
9690843fd9 Cleanup of numerous issues and oversights. 2019-02-25 16:24:51 +10:00
Hawk_v3
b3c29b0e89 Merge remote-tracking branch 'upstream/master' 2018-11-20 00:02:11 +00:00
Anewbe
eb54117edf Merge pull request #5733 from Neerti/area_initialize_fix 
Fixes Area Initialization
 2018-11-04 18:42:42 -05:00
Hawk_v3
4e66b1f7c7 Initial merge fixes 
Clean Compile, 0E, 0W
 2018-10-03 20:08:55 +01:00
Hawk_v3
beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Hawk_v3
fec9817c54 Moving robot icons around, and merging. 
Any robot icons in robots_vr.dmi should work automagically if I'm reading vore's robot icon code right. Let's try it.
 2018-09-12 23:34:20 +01:00
Neerti
3de28fa6b2 Ambience Refactor (#5476) 
* Refactors how ambience is assigned, removes bad ambience, ports good ambience from tg

* Apparently that file is still used, not worth the salt to remove it.

* Changelog
 2018-08-06 11:12:17 -05:00
Anewbe
f5312bcedd Refactors supply controller 2018-07-24 11:04:16 -04:00
atermonera
95398466de refactors supply controller 2018-07-22 13:44:44 -07:00
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -04:00
Arokha Sieyes
6b42df0685 Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018 
# Conflicts:
#	code/__defines/misc.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/computer3/computers/card.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/stacks/medical.dm
#	code/game/objects/structures/signs.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/client/client defines.dm
#	code/modules/client/client procs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/events/radiation_storm.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_dispenser.dm
#	config/example/config.txt
#	html/changelogs/.all_changelog.yml
#	interface/skin.dmf
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-05-25 13:23:47 -04:00
Neerti
be73b8c36a for(var/bad_code in world) 
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
 2018-04-29 17:55:04 -04:00
Repede
372e145108 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs
 2018-04-27 21:45:13 -04:00
Arokha Sieyes
6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018 
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
 2018-04-25 17:23:33 -04:00