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
80,370 Commits 5 Branches 0 Tags
22cd33a0b67a75e64c20f371aaefd758f8cf331d
Commit Graph

989 Commits

Author SHA1 Message Date
Heroman
c82722cdbf Ports fixes from Polaris early 2019-07-30 05:23:32 +10:00
Hawk_v3
8654b6bdf4 Merge remote-tracking branch 'upstream/master' 2019-07-19 22:05:31 +01:00
Novacat
ea05ba7d02 Merge pull request #5454 from TheFurryFeline/TFF-Nomming_Collars 
Edible Collars
 2019-07-17 17:36:11 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
TheFurryFeline
ca01048bab Edible Collars 
Allows those with Trash Can trait to nom on someone's collar. Also adds in a custom flavour message.
 2019-07-10 13:43:29 -04:00
Hawk_v3
7bb9c92c9a Merge remote-tracking branch 'upstream/master' 2019-06-03 12:31:48 +01:00
Neerti
f5f20628fd Merge pull request #6169 from GeneriedJenelle/patch-1 
Ports Radial Menus
 2019-05-28 14:25:49 -04:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Unknown
808e64c3bb Ports https://github.com/PolarisSS13/Polaris/pull/6146 2019-05-01 20:50:31 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Heroman
b17718ea6c Implements selection of whitelisted species 2019-04-28 17:45:44 +10:00
Heroman3003
1290db61f8 Initial commit 2019-04-26 11:19:53 +10:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Neerti
3f7d2a0450 Fixes fireaxe cabinets 2019-04-16 22:00:42 -04:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Spades
16ee6b9221 Merge pull request #4897 from Heroman3003/bone-zone 
Added a remains option for digesty vore
 2019-04-12 09:11:04 -04:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04: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
Novacat
f73a757152 Merge pull request #4924 from VOREStation/upstream-merge-6025 
[MIRROR] Replaces AI-controlled Maint Drones with AI-controlled Borg Shells
 2019-04-06 14:56:27 -04:00
Unknown
c4860391b6 Conflict Resolution 2019-04-06 14:47:21 -04:00
Unknown
0482da8c52 Ports two polaris bugfix PRs early 2019-04-06 12:21:24 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Heroman3003
82ed5a8fe1 Made gurgle bones digestible and trash-edible 2019-04-02 08:42:07 +10:00
Heroman3003
c1d356fe8b Added a remains option to digesty vore 2019-04-01 12:28:02 +10:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Novacat
6729bfb147 Merge pull request #4858 from Heroman3003/uncontamine 
Added ability to toggle and configure contamination and item digestion
 2019-03-28 22:12:38 -04:00
Novacat
bada08276f Merge branch 'master' into upstream-merge-5959 2019-03-28 20:30:41 -04:00
Unknown
a4373601f0 Fixes Merge Errors 2019-03-28 13:53:03 -04:00
Unknown
cf39c61c2d Conflict Resolution 
This one made a lynx cry.
 2019-03-28 13:19:19 -04:00
Neerti
3256202407 [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work 2019-03-27 22:02:07 -04:00
Unknown
a22ada82f1 Reminder: Yell at Leshana for not tagging edited code. 2019-03-27 20:03:23 -04:00
kevinz000
e105a047e1 Adds a better debug controller verb that can target all controllers/processes/mc/failsafe/config/etc 2019-03-27 19:36:07 -04:00
Novacat
dce3466f3b Merge pull request #4684 from VOREStation/upstream-merge-5814 
[MIRROR] [READY]Makes a bunch of processes subsystems instead
 2019-03-27 17:46:31 -04:00
kevinz000
6415e4193f [READY]Makes a bunch of processes subsystems instead 2019-03-27 16:03:51 -04:00
Unknown
55b4d304f5 Conflict Resolution Part One 2019-03-27 15:21:58 -04:00
Neerti
fe0b7373b3 Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it 2019-03-27 14:49:30 -04:00
Novacat
b611edacfa Merge pull request #4658 from VOREStation/upstream-merge-5812 
[MIRROR] Fixes lift and shuttle moves not updating lighting
 2019-03-27 13:52:30 -04:00
Unknown
0e6c82ed60 Conflict Resolution 2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b Upgrades SDQL2 and refactors it to a datum 2019-03-27 11:50:49 -04:00
Novacat
a5cfa5519a Merge pull request #4602 from VOREStation/upstream-merge-5765 
[MIRROR] Speeds up getFlatIcon
 2019-03-27 03:07:16 -04:00
Neerti
86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Heroman
86f0cb2919 Added ability to toggle and configure contamination and item digestion 2019-03-19 14:46:07 +10:00
Spades
41bcb6a729 Merge pull request #4805 from Sebbe9123/master 
Changes vore egg_types to not interfere with mob egg_types.
 2019-03-02 08:03:58 -05:00
Spades
6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -05:00
Sebbe9123
f982ffa53c changes eggtypes to not mess with mob eggtypes. 2019-02-25 11:59:24 +01:00
Neerti
a0c757cd05 Adds a new Shroud design 2019-02-18 03:52:22 -05:00
Hawk_v3
2bc1f83de7 Merge remote-tracking branch 'upstream/master' 2019-01-15 20:56:39 +00:00
Spades
c6c7d98a2d Merge branch 'master' into upstream-merge-5735 2019-01-14 11:20:55 -05:00
Anewbe
6584dbf80d Merge pull request #5812 from Verkister/patch-19 
Fixes lift and shuttle moves not updating lighting
 2019-01-10 17:00:24 -05:00