cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,695 Commits 8 Branches 0 Tags
71b5f2f4cd987f870830e24fa8b4c73b1c22e38d
Commit Graph

146 Commits

Author SHA1 Message Date
dependabot[bot]
4fadca14dd Bump pillow from 6.2.0 to 7.1.0 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 6.2.0 to 7.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/6.2.0...7.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-13 07:27:20 +00:00
Cadyn
213cec1dcc Reset map files. 2020-10-14 21:51:31 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
a306353b7a chmod +x nanomap-renderer-invoker.sh 2020-09-28 14:51:29 -07:00
ShadowLarkens
cf9b39b4a9 Set up GitHub action for nanomap generation 2020-09-25 03:25:07 -07:00
ShadowLarkens
8c338ed9da NanoUI PDAs made Modular (lazy commit) 2020-09-16 21:31:49 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
dbbaaca434 Add random playsound dump script 2020-08-21 09:33:03 -07:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
e60a98da74 We're close, I can feel it 2020-07-21 17:52:38 -07:00
ShadowLarkens
462c8ccac9 Once again, I am asking for your support 2020-07-21 17:46:55 -07:00
ShadowLarkens
5e86d718fd Let's try again with less failure 2020-07-21 17:39:19 -07:00
ShadowLarkens
8ed4d6e173 Attempt to compile TGUI as part of TRAVIS 2020-07-21 17:35:15 -07:00
izac112
ff69e5cde0 Update requirements.txt 2020-05-22 11:35:03 +02:00
izac112
a66fd72dba # YW Edit removes "|| exit 1" until we can fix our submaps 2020-05-18 22:46:18 +02:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Leshana
ce9a9cbed1 Make failing unit tests actually fail travis checks. 2020-04-30 19:24:10 -04:00
Repede
7f1a6d6cc7 Fuck this shit 
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
 2020-04-04 14:37:55 -04:00
Killian
af4dc435a5 once more with feeling 2020-04-04 16:26:23 +01:00
Killian
89bf195956 wiring fix, mapmerge update 2020-04-04 16:23:19 +01:00
Aronai Sieyes
24164b8929 Merge into jobby travis.yml 2020-03-24 18:58:31 -04:00
Aronai Sieyes
19d2dad065 Rewrite how Travis works 
Moves script files out into a separate directory, and creates a jobs matrix to allow naming of jobs and specific jobs to not download all the deps if they don't need to.
 2020-03-17 18:47:52 -04:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Atermonera
c8a59aa5f7 513 Compatability 2019-12-15 14:48:14 -05:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
dependabot[bot]
8b3096b06e Bump pillow from 5.1.0 to 6.2.0 in /tools/mapmerge2 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 5.1.0 to 6.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/5.1.0...6.2.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-22 21:50:18 +00:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Rykka
7ed11de790 Somehow this one had /_maps/ instead of /maps/ too 2019-09-24 04:22:10 -06:00
Rykka
4fc7887bc3 Update for clarity 2019-09-24 04:19:43 -06:00
Rykka
027600ab7e Updates readmes to be more clear. 2019-09-24 04:16:13 -06:00
Rykka
ab7740eb7f Fixes mapmerge.bat 2019-09-24 04:04:33 -06: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
Neerti
585b688709 Adds Identification System, New Autoinjectors 2019-03-27 02:25:55 -04:00
Hawk_v3
10ca5bb70f Merge remote-tracking branch 'upstream/master' 2018-10-14 17:09:41 +01:00
Arokha Sieyes
49d417dcf6 Stop using old pygit2 because it's terrible on windows 2018-10-06 13:00:01 -04:00
Arokha Sieyes
e3690cf196 New mapmerge2 2018-10-06 12:33:10 -04:00
Arokha Sieyes
eaf45ccc08 New hooks folder 2018-10-06 12:33:04 -04:00
Arokha Sieyes
dd7c6533a5 Clean up unused merge things 2018-10-06 12:32:41 -04: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
Leshana
958d78b418 Adds a nice script required for the PR mirror thing to work. 2018-05-27 01:09:56 -04:00
Repede
95a1fade33 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/clothing/gloves/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	config/example/motd.txt
#	icons/mob/human_face_or_vr.dmi
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme
 2018-04-20 09:03:58 -04:00
Arokha Sieyes
bca4a60a8e Update MapMerge2 2018-04-19 13:16:31 -04:00
Kelshark
9bb51e45e4 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi
 2018-02-24 22:51:59 -05:00
Kelshark
aea1eee615 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
 2018-02-21 22:19:24 -05:00
Leshana
02221ac7bf Implements a utility to test NanoUI templates outside of BYOND. 
Useful for rapid development and previewing of the HTML.
 2018-02-18 19:48:57 -05:00
Aronai Sieyes
03a3309f1a BAD README 2018-02-03 01:26:13 -05:00
Aronai Sieyes
93958c8090 Merge pull request #2944 from VOREStation/aro-mapmergedoc 
Mapmerge2 Readme
 2018-02-03 01:16:02 -05:00
Aronai Sieyes
34ec1b15c1 Mapmerge2 Readme 2018-02-03 00:41:05 -05:00