cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,216 Commits 5 Branches 0 Tags
a0ab995551a0e8cb15b8ca5f0026aa5f21698cbc
Commit Graph

124 Commits

Author SHA1 Message Date
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
Arokha Sieyes
4d559b4c63 TGM guys! 2018-02-02 23:26:40 -05:00
Kelshark
c048a8ea8b Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt
 2018-02-02 19:25:51 -05:00
Arokha Sieyes
a1564b4b54 DMM by default for dmm.py 2018-01-28 16:47:42 -05:00
Arokha Sieyes
9dabf02163 Fixes some stuff 2018-01-28 16:09:21 -05:00
Arokha Sieyes
ae08a6896f Add MapMerge2 from /tg/ 2018-01-27 23:38:52 -05:00
Kelshark
641246155c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
 2017-06-01 17:25:39 -04:00
Unknown
50c3e40a22 Adds mapmergePY 
More or less because I CBA to install java right now.
 2017-05-26 20:05:38 -07:00
Kelshark
15b8fcbe6d Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/machinery/computer/communications.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	config/custom_items.txt
#	icons/misc/title_vr.dmi
#	icons/mob/human_races/r_def_xenochimera.dmi
#	maps/RandomZLevels/fileList.txt
#	vorestation.dme
 2017-05-24 13:46:58 -04:00
Yoshax
339b91dd7c Updates map merge tools to work for Tether, maybe, I hope? 2017-05-21 17:06:36 +01:00
Kelshark
71c0531829 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/multiz/basic.dm
#	config/custom_items.txt
 2017-04-29 10:13:45 -04:00
Leshana
5dac8b91b6 Merge branch 'master' of ../Polaris into polaris-sync 2017-04-18 19:35:59 -04:00
MagmaRam
40ea024cc5 Adds some instructions on How to update the changelogs 
It's mostly nicked from /tg/'s wiki page, but has some other stuff, too.
 2017-04-17 11:45:28 -05:00
Kelshark
8ee9f436ea Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/dead/observer/say.dm
#	config/custom_items.txt
#	vorestation.dme
 2017-04-13 19:43:56 -04:00
Kelshark
4cec8849a2 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	config/custom_items.txt
#	icons/mob/widerobot_vr.dmi
 2017-04-09 09:56:44 -04:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync 
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
 2017-04-01 19:19:42 -04:00
Anewbe
dc58616dc8 Merge pull request #3153 from Yoshax/iconsplitting 
'Improved' solution to the full uniform.dmi problem
 2017-03-28 18:22:04 -05:00
Arokha Sieyes
1ba87bea73 Merge polaris sync 2017-03-28 12:24:46 -04:00
Anewbe
fb03579495 Merge pull request #3142 from VOREStation/humancutter 
Human Scissors tool
 2017-03-27 23:29:55 -05:00
Yoshax
3a483995e0 Splits rolled down suits and rolled up sleeves into their own icon files 2017-03-27 03:39:11 +01:00
Yoshax
c6d8d3e51c Creates a tool for splitting dmis 2017-03-27 03:34:23 +01:00
Arokha Sieyes
4c35144615 Human Scissors tool 
Adds a tool to the tools folder called HumanScissors that I wrote. As the readme explains, it takes every iconstate in SpritesToSnip.dmi, and cuts them with CookieCutter.dmi sprites. So if you load a single 4-direction race sprite into SpritesToCut.dmi and load all the bodypart icons into CookieCutter.dmi (which I put in there already since that's probably what people will use it for), you get the output of the race sprite cut up into ready-to-use bodypart sprites. The output will contain names based off the names in SpritesToSnip.dmi and CookieCutter.dmi.
 2017-03-26 00:01:16 -04:00
Arokha Sieyes
d6c04b78e9 Dynamic Shuttles - Map Changes 
Updates all the shuttle turfs.
 2017-03-25 20:46:31 -04:00