cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 19:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,453 Commits 7 Branches 0 Tags
f656dd6dfb6f67e81cb155535f0e26af6b6c58f3
Commit Graph

178 Commits

Author SHA1 Message Date
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Leshana
bd9df39879 Fix Runtime in areas.dm,307: Cannot read null.len 
area.ambience is never expected to be null.
 2020-02-04 16:33:21 -05:00
Heroman3003
96fd2bf748 Fixes 3 maps 2019-11-14 12:09:20 +10:00
Unknown
992395bf2e Updates fileList.txt 2019-09-19 23:59:07 -04:00
Unknown
93b86d25f6 Port of #5914 
Fixes all the wierd filediffs.
 2019-09-19 23:56:25 -04:00
Sebbe
224ce6582b Hopefully fixes every path 
plz game, I didn't have fun ;w;
 2019-04-16 10:41:04 +02:00
Sebbe
1e884ce293 Fixes pathing on a lot of maps, removes snek from beach. 2019-04-15 10:53:57 +02:00
Poojawa
227a32e0a3 mass replace simple_animal with simple_mob along all maps 2019-02-02 06:11:55 -06:00
Cameron653
9dd973221d Resolves compile errors with the exception of map errors. 2019-01-12 21:09:29 -05:00
Spades
1338225afa Resolves some merge conflicts 2019-01-05 16:29:19 -05:00
Atermonera
2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Arokha Sieyes
c1ffc0c103 Just the maps we care about for mapmerge. 2018-09-27 18:17:32 -04: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
Arokha Sieyes
b13c703c7e Fix more VS-specific maps having tags 2018-04-25 18:27:19 -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
Arokha Sieyes
f0779da58d Stage 2 tag removal 2018-04-18 17:37:41 -04:00
Arokha Sieyes
78134b2b29 Stage 1 tag removal 2018-04-18 17:33:22 -04:00
Leshana
6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30 
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.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/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
 2018-03-31 09:20:59 -04:00
Aronai Sieyes
7d3aec96fd Arranges lots of things into planes (#5072) 
* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic
 2018-03-28 12:59:12 -07:00
Arokha Sieyes
082cc3e375 VS: First exploration area + exploration shuttle 2018-01-27 14:12:18 -05:00
Arokha Sieyes
238ce2c8d0 VS: Get rid of beach, move wild stuff 2018-01-27 14:10:53 -05:00
Leshana
805897eafb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20 2018-01-21 00:23:00 -05:00
Leshana
fe431c8e46 Trims back wilderness code that was dependent on tether map. 
* Reverted random.dm back to Polaris as there is no need for the VOREStation customs.
* Fixed /obj/random/outside_mob so it will actually work (You can't set vars on a type!)
* Removed all wilderness code outside of the tether map.  It was only setting life_disabled on mobs spawning there. We can do that with a subsystem or by dynamic maploading instead.
 2018-01-17 15:23:22 -05:00
Spades
07762f31e7 Some disorganizes changes by Aces 
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
 2017-09-21 03:22:20 -04:00
Spades
11e7dd260d Quick fixes 2017-08-27 18:00:01 -04:00
Spades
0ff19705ee Numerous station updates, including a new shuttle 2017-08-07 06:28:20 -04:00
Spades
c0811b394d More changes 2017-07-02 14:51:59 -04:00
Spades
6af39bea3f Trying to make a syndie base 2017-07-02 00:28:19 -04:00
Spades
d1c7f2ca27 ListeningPost.dmm is fixed 2017-07-01 02:21:06 -04:00
Spades
e84f01b0db Fixed blackmarketpackers.dmm 2017-07-01 00:55:04 -04:00
Spades
d5bcce1806 Resized Beach.dmm 2017-06-26 22:50:49 -04:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code 
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
 2017-06-10 22:44:03 -04:00
Leshana
5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
Leshana
c4bdc4c027 Updated VOREStation specific files for the ammo path reorganization. 
* Updated paths in dm files
* Updated references in all dmm files for tether, virgo, and randomz
 2017-06-02 12:18:13 -04:00
Arokha Sieyes
3128139a80 Disable gateway until maps can be resized 
They need to be the same size as the rest of the maps, which might mean splitting them into multiz maps or just rearranging.
 2017-05-22 15:55:45 -04:00
Leshana
e156339dbd Working theory 2017-04-15 23:15:19 -05:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
 2017-04-15 23:14:32 -05:00
Leshana
e8af4afc88 Port tg/paradise/good soft-edge lighting 
Ports https://github.com/ParadiseSS13/Paradise/pull/6161
Its merged in nearly verbatim as far as the lighting module goes.
Changes outside the lighting module are merged based on our codebase.
 2017-04-12 19:11:45 -04:00
Spades
b82e8c12d5 Various updates and small fixes 
Map updates, gateway tweak, and a few fixes for some mobs that were
behaving stupidly.
 2017-04-09 17:54:09 -04:00
Arokha Sieyes
5473c63fb8 Fix zoo shuttle turfs 
Fixed to comply with new shuttle designs
 2017-03-29 22:42:08 -04:00
Leshana
d1000f0864 Fixed random Z-Levels to account for simple_animal path changes 2017-03-25 21:58:49 -04:00
Arokha Sieyes
3857cb92b2 Arokha SA Rework (VOREStation) 2017-03-22 19:32:19 -04:00
Leshana
17c74c17fc Updated our custom items and maps to account for the path changes for boots! 2017-03-06 21:46:35 -05:00
Arokha Sieyes
ee25004483 More map stuff. 2017-03-03 00:19:15 -05:00
Arokha Sieyes
725cf4ee01 Fixes some paths 
Some of these maps have invalid paths, so just fixing them. Mostly the repathed surgical tools, and one instance of an O2 tank.
 2017-02-11 01:58:24 -05:00
Spades
b66523659e Additional fixes 
- Fixes camera layering.
- Fixes misaligned sleepers in pirate ship.
- Fixes broken disposals by security office.
- Fixes broken holocarp.
 2017-01-02 04:24:55 -05:00
Spades
21cd4e4791 Voremob tweaks, bellies now escapable (#783) 
* Voremob tweaks, bellies now escapable

Also disabled all the non-vore variants in the code to avoid confusion,
excluding aliens for now, since other stuff is handled there.

* comment removal

* Zoo.dmm hotfix

Makes the snakes play nice.

* Travis stop being a cunt

* Minor Tweak
 2016-12-30 11:27:07 -05:00
Spades
cc0cfba27b Map Sync, some Zoo and Vore Mob fixes 
- Polaris map synced with ours (Resolves #331)
- Nerfed pounce chance on most vore mobs. The default chance of being
eaten is now only 1:20 whereas previously it was 1:2 chance.
 2016-12-10 15:36:17 -05:00