cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,973 Commits 10 Branches 0 Tags
067ab7459b9d6c2891a8fdf12229c1fb8f2e9814
Commit Graph

1139 Commits

Author SHA1 Message Date
TheFurryFeline
6b7ee364ba Add A Random Alien's Xenochimera 
Might as well include https://forum.vore-station.net/viewtopic.php?f=46&t=1569 for this one.
 2019-08-18 11:20:16 -04:00
TheFurryFeline
3db3e1b705 Whitelists Hollifex For Diona 
PR for Hollifex's approved app https://forum.vore-station.net/viewtopic.php?f=46&t=1568
 2019-08-18 11:03:54 -04:00
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Mewchild
798e45cc1a Adds Westfire to Xenohybrid Whitelist 2019-08-13 23:03:49 -05:00
izac112
2d27200833 and done 2019-08-14 02:22:10 +02:00
izac112
e2570c5585 Vasharr fluff 2019-08-14 01:34:06 +02:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Screemonster
21d274b6b9 Rykka xenochimera whitelist 2019-08-02 10:13:47 +01:00
chaoko99
ca099753a4 adds chaoko99's custom item 2019-07-25 20:59:44 -07:00
Hawk_v3
c7b05c05fb Merge remote-tracking branch 'upstream/master' 2019-06-11 02:34:25 +01:00
Unknown
2b20e6081d Cleaning permabanned custom items 2019-06-10 13:09:23 -04:00
Heroman
bbe14f58db Updates whitelist too. 2019-06-09 18:21:12 +10:00
Heroman
dea577a951 Updates fluff item lists 2019-06-09 15:40:38 +10:00
Heroman
ba420b4ff6 Fixes Natje's custom item 2019-05-16 06:05:06 +10:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Heroman
ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
Novacat
589dbd69de Merge pull request #5135 from Novacat/nova-heterochromia 
Adds Subtle Teleporter
 2019-04-26 15:16:47 -04:00
Unknown
16e449ce1e Config-side expired permit purge 2019-04-26 14:58:49 -04:00
Novacat
ad3e9fc6bd Merge pull request #5101 from Heroman3003/timeclock-finishing 
Implements switching on/off duty midround via timeclock terminals
 2019-04-25 21:11:07 -04:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Atermonera
6cb44efd10 Merge pull request #6114 from Neerti/gamemode_config 
Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:33:38 -04:00
Neerti
40e5fda9ca Adds Config-Controlled Automated Solar Setup (#6107) 
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
 2019-04-21 03:34:25 -04:00
Heroman3003
1a9cdecb32 Finishes timeclock duty switching functionality 2019-04-19 10:28:38 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Unknown
a5449b38dc Remind me not to code while sleepy 2019-04-10 15:02:56 -04:00
Unknown
4a0b4c32cb Whitelists Rapidvalj for Skrellian 
- Also allows Custom species to verbally speak Terminus, Skrellian, and High Skrellian
 2019-04-10 14:58:39 -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
4420f0cb81 Fixes Resh's Navy blue HoS Jacket 2019-04-06 13:36:39 -04:00
Neerti
1d59d8683c Replaces AI-controlled Maint Drones with AI-controlled Borg Shells 2019-04-06 05:07:05 -04:00
Novacat
44e3511842 Merge pull request #4812 from TheFurryFeline/patch-1 
Add Resh's HOS Coat
 2019-03-28 21:28:50 -04:00
Novacat
7701db8aae Update game_options.txt 2019-03-28 21:02:43 -04:00
Neerti
256fb03dcc Merge pull request #5942 from Anewbe/headgibs 
Headgibbing is a config thing
 2019-03-28 20:38:34 -04:00
Novacat
9759df2de4 Merge pull request #4756 from TheFurryFeline/TFF-Vakashi_Permit 
Vakashi's Permit
 2019-03-28 17:40:23 -04:00
Novacat
f98177b682 Merge pull request #4741 from Jwguy/Silver-KoyoFluffApp 
Adds Koyo's Fluff Item Box
 2019-03-28 16:34:41 -04:00
Atermonera
db1fdccdd5 Merge pull request #5898 from Anewbe/more_gibberish 
Removes the hyphen from default language keys, should make people spew gibberish less
 2019-03-27 21:15:27 -04:00
Unknown
03dcb65c01 Fixes most of the issues 2019-03-27 00:38:44 -04:00
TheFurryFeline
7fdcb505a0 Typo fix 2019-03-01 15:06:15 -05:00
TheFurryFeline
04cdb9d7d4 Minor Change 
Phi's char name changed, so this'll make sure that he'll still get his items. :>
 2019-03-01 14:18:11 -05:00
Spades
190ead1dfd Merge pull request #4552 from VOREStation/upstream-merge-5748 
[MIRROR] Adds ability to selectively disable submap rotation.
 2019-02-23 11:45:49 -05:00
TheFurryFeline
538c3b21ba Vakashi's Permit 
Enables the character to spawn in with their permit as well as a pepperspray as per approval at https://forum.vore-station.net/viewtopic.php?f=27&t=1447
 2019-02-08 19:39:04 -05:00
Silver
fcc1bf5b06 Adds Koyo's Fluff Item Box 
Adds Koyo's Fluff Item Box, approved at https://forum.vore-station.net/viewtopic.php?f=27&t=1502
 2019-02-01 21:39:18 -06:00
Mike Showman
4c5d332ff1 few things were broken 2019-01-31 04:43:22 -05:00
Spades
3ba4a9005a Merge pull request #4567 from Novacat/nova-pathfinder 
Adds Ascian's Shelter Capsule
 2018-12-22 09:41:02 -05:00
Hawk_v3
b6988c5a09 Merge remote-tracking branch 'upstream/master' 2018-12-15 19:37:28 +00:00
Mewchild
7477c696dc Updates Fluff Item 2018-12-14 13:21:49 -06:00
Unknown
85ea1387b7 Update to newest master branch 2018-12-13 21:28:24 -05:00
Unknown
5e58423b29 Fixes #4111 2018-12-13 21:28:24 -05:00
Unknown
7a22b9767c Adds Ascian's Shelter Capsule 
- Adds Silver-trimmed shelter capsule, a luxury capsule that has a redecorated interior and some extra food, drink, and emergency supplies.
- Fixes issue where Shelter capsule pod beds started with no padding
 2018-12-13 21:28:24 -05:00
Spades
5742799f74 Restores a comment 2018-12-13 06:00:23 -05:00