cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-21 23:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,766 Commits 6 Branches 0 Tags
ba36df71a7657bf6656c7b19f81b51e5b27875dc
Commit Graph

16690 Commits

Author SHA1 Message Date
JoanRisu
0ecd0a51be Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-12-12 18:37:33 +09:00
JoanRisu
2ca24521d9 fixing PDAs and adding squirrelkin language. 2016-12-12 18:36:12 +09:00
killer653
2e47d44371 Should be the last thing needed to get this to work. 2016-12-11 22:11:36 -05:00
Cameron653
202fbe3889 Update vorepanel_vr.dm 2016-12-11 20:32:43 -05:00
Cameron653
1906cb4e1e Update vorepanel_vr.dm 2016-12-11 20:32:18 -05:00
Cameron653
475f307753 Fixes dresses 
Ports over 301f97a2b3

Instead of syncing (Which would take longer) I'm just manually putting the bugfix in. This will cause a conflict with the next sync, but all that needs to be done is the comment I put in taken out (Along with the heading in github when a conflict occurs) and it'll work fine.

I'll solve the conflict next time we sync next month.
 2016-12-11 18:27:23 -05:00
Anewbe
6d7d5af896 The TSC jumpsuits should be properly selectable now. 2016-12-11 16:50:04 -06:00
Spades
ccfed7f5a4 Refactor 2016-12-10 15:43:59 -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
Cameron653
6869e3c048 Removes is_skrell 2016-12-10 14:09:56 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
woodratt
9e20a8cf15 Dress bugfix 
Fixes the issue of dresses using the greydress sprite for on mob sprites.
 2016-12-10 01:29:12 -08:00
Spades
246f7eee6a Merge pull request #731 from DarkWolfInsanity/IvyHoloID 
IvyMooMoo - HoloID
 2016-12-10 01:33:35 -05:00
MagmaRam
f256342b09 Merge pull request #2850 from ForFoxSake/gunsarenttoys 
Corrects the Shotgun Sawing Procedure
 2016-12-09 22:53:40 -06:00
MagmaRam
7e1e710df5 Merge pull request #2847 from Woodratt/1.6.6_shoes_n_gloves 
1.6.6 shoes and gloves
 2016-12-09 22:53:32 -06:00
MagmaRam
675479283d Merge pull request #2844 from Anewbe/eva_gloves 
EVA hardsuit gets insulated gauntlets
 2016-12-09 22:51:37 -06:00
ForFoxSake
3e0af860e9 Makes the shotgun go off if it's modified while loaded. 2016-12-09 13:22:04 +00:00
ForFoxSake
89d4e3b824 Fixes SMES power window from throwing runtimes while in construction. 2016-12-09 13:05:57 +00:00
woodratt
ad92bc899b 1.6.6 shoes and gloves 
Adds shoes and gloves from Bay.

Forensic gloves added to the loadout, detective only.
Work gloves added to the loadout.
Tactical gloves added, not to loadout.
Cowboy boots added (existing sprite, loadout)
Jungle boots and Duty boots added, (loadout).
Dress shoes added white and black, (loadout).
Fixed pathing issue with purple beret.
 2016-12-08 20:59:04 -08:00
Anewbe
a8aa9d1cfa Tweaks walking speed 2016-12-08 21:26:37 -06:00
Anewbe
bf9c76ee3c Merge pull request #2839 from MagmaRam/EAL_implant 
Adds an implant that allows humans to speak EAL.
 2016-12-07 21:39:45 -06:00
Anewbe
bcc6ac03e3 EVA hardsuit gets insulated gauntlets 2016-12-07 17:41:42 -06:00
MagmaRam
95aa0d152d Finally got around to implementing Zuhayr's suggestion. 2016-12-06 20:16:42 -06:00
ForFoxSake
716c89b8cd Fixes water-cooler runtime. 2016-12-06 22:38:52 +00:00
killer653
fa5df25a60 Adds mega/shrink shrooms to vendors 2016-12-04 21:07:53 -05:00
Cinder
6e72f73f99 Update custom_boxes_vr.dm 2016-12-04 19:25:13 -06:00
Cameron653
8a12de6ed2 Create seed_pacets_vr.dm 2016-12-04 20:01:31 -05:00
Spades
8c9c0803fe Merge pull request #727 from Cameron653/master 
Modifies ERT dogborg disabler & minor bugfixes
 2016-12-04 13:46:16 -05:00
Spades
22006dc34f Merge pull request #733 from Screemonster/feralmonsterness 
Xenochimera bugfix and feralness overhaul
 2016-12-04 13:45:37 -05:00
killer653
f79da03905 Minor text fixes 2016-12-02 17:43:42 -05:00
killer653
81687384cf Makes it so mobs aren't given reagent lists. 
Should fix #732

This time put on the correct account for testing
 2016-12-02 16:34:15 -05:00
Cameron653
c4d085559f Reverts an accident. 
The fix for absorption was supposed to stay in my desktop github until i was done
 2016-12-02 15:42:48 -05:00
Screemonster
31c1c29ba3 two-period ellipses are my fucking bane 2016-12-02 04:23:00 +00:00
MagmaRam
c5b77fcf9e Adds an implant that allows humans to speak EAL. 
It's available in the loadout for 2 points.
 2016-12-01 22:22:46 -06:00
Cameron653
d6f3caa2ac Makes it so mobs aren't given reagent lists. 
Should fix #732
 2016-12-01 22:14:07 -05:00
Screemonster
d6a0f858c0 Makes xenochimera go feral in response to pain 2016-12-01 23:28:42 +00:00
Cinder
d39e075610 Update custom_items_vr.dm 2016-11-30 19:05:35 -06:00
Anewbe
16bea57254 Merge pull request #2836 from Woodratt/1.6.5_Uniforms 
1.6.5 Port of Bay's uniforms
 2016-11-30 15:37:51 -06:00
Cinder
6fa444c289 Added IvyMooMoo's HoloID / a kit so it spawns 
Kit includes:
-Ivy's HoloID
-A Vanilla Cake
-A Box of Cigarettes
-A Box of Matches
-A White Beret
 2016-11-30 02:36:13 -06:00
woodratt
5444a4ad52 1.6.5 Port of Bay's uniforms 
- Port of all of the uniform items that we did not have.
- Aether, Sweater, Ward-T. Frontier, Focal, Heph. Grayson, M. Bill, PCRC outfits/uniforms ported. (Loadout, some restricted)
- All of the military jumpsuits and uniforms have been ported. (Not Avail).
- Plain utility outfits are available in the loadout, as well as the pt outfits (except for marine).
- Hazard, Sterile, Saare, and Confederate outfits ported. (Not Avail).
 2016-11-29 03:07:18 -08:00
Cameron653
6c38e76f98 Makes disabler 1 shot stun 2016-11-28 14:18:06 -05:00
Cameron653
236769651c Update dog_modules_vr.dm 2016-11-28 14:17:12 -05:00
Spades
fd6587567a Fixes Catgirls, fixes Carp 
Both had broken sprites. Now they aren't broken.
 2016-11-27 23:49:37 -05:00
Anewbe
1c7b32787b Skrell chem changes 2016-11-27 19:18:02 -06:00
MagmaRam
5bf3cd725f Merge pull request #2833 from Anewbe/skrell_numbers 
Adjusts some Skrell numbers so they like warm and dark
 2016-11-27 17:45:48 -06:00
MagmaRam
77cbab5704 Merge pull request #2831 from Anewbe/singlang_again 
Signlang should now work while muzzled.
 2016-11-27 17:45:27 -06:00
Anewbe
b7a2c5efd4 Lungs that are repaired will stop causing oxyloss 2016-11-27 16:50:17 -06:00
Anewbe
c5d77d2b6e Adjusts some Skrell numbers so the like warm and dark 2016-11-27 16:20:45 -06:00
Anewbe
f725bbcaad Signlang should now work while muzzled. 2016-11-26 23:37:49 -06:00
Anewbe
e75b6c4b2e Merge pull request #2829 from Woodratt/1.6.4_hathathat 
1.6.4 Port of Baystation head items.
 2016-11-26 20:24:00 -06:00