cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,263 Commits 7 Branches 0 Tags
ad476cbfc5a442cbbc7c252fb3a935ffed814d10
Commit Graph

23293 Commits

Author SHA1 Message Date
Cameron653
c5d3883ef5 Create prometheans_vr.dm 2016-06-07 15:08:17 -04:00
Arokha Sieyes
a289710f6f Merge pull request #304 from Cameron653/master 
Adds in a new prosthetic limb set.
 2016-06-07 01:48:02 -04:00
Arokha Sieyes
df4c821984 Merge pull request #312 from JoanRisu/Fluff_Items_worshop 
fluff adjustments
 2016-06-06 21:37:34 -04:00
JoanRisu
d2a2419e07 Minor additions 2016-06-06 16:54:38 -07:00
JoanRisu
4670997eea Federation Dress Shirt 2016-06-06 16:39:29 -07:00
Spades
36cdadbe09 Merge pull request #308 from VOREStation/idfix 
Fixes bellies with 'stuck' IDs
 2016-06-06 14:06:35 -04:00
JoanRisu
ee15d86e6a Assassin's kit 2016-06-06 10:31:25 -07:00
JoanRisu
cc2af62ee3 rolled back some stat inheritance changes. 2016-06-06 09:23:40 -07:00
JoanRisu
a550abf777 Added new ammo for Crescent Rose 2016-06-06 08:30:17 -07:00
Arokha Sieyes
eeffdd8594 Touch up fitness machine code 2016-06-06 02:06:02 -04:00
Arokha Sieyes
694e60fbf7 Fixes bellies with 'stuck' IDs 2016-06-06 01:32:22 -04:00
Spades
ca6ae06ecf Merge pull request #298 from JoanRisu/Fluff_Items_worshop 
Fluff items: Medals for the meat shields
 2016-06-06 00:12:42 -04:00
Cameron653
744854b9a0 cc 2016-06-05 22:49:09 -04:00
Cameron653
35301d3d9c Adds in new prosthetic build 2016-06-05 22:41:02 -04:00
JoanRisu
180f5a3017 Added medals for these people: 
Dhaeleena:Dhaeleena M'iar
Vorrarkul:Lucina Dakarim
 2016-06-04 06:29:16 -07:00
JoanRisu
dabcd61aab SQUIRREL COMBAT SPACESUIT...along with the Bolt Action and M14. 2016-06-04 05:43:02 -07:00
Arokha Sieyes
3f47fe64b6 Merge pull request #291 from VOREStation/dev-Ace 
Replaces several mobs with vore versions
 2016-06-03 23:57:39 -04:00
Spades
481908203c Fuck off Travis. 2016-06-03 23:40:45 -04:00
Arokha Sieyes
f3a4cc0205 Merge pull request #295 from JoanRisu/Fluff_Items_worshop 
Fluff: Crescent Rose Revived!
 2016-06-03 23:40:28 -04:00
Spades
bd2dcfe956 Compile error fix. 2016-06-03 23:27:10 -04:00
JoanRisu
e7ddc06368 Rebuilt the Crescent Rose code and edited the custom swords because they were inheriting the wrong stats. 2016-06-03 20:21:12 -07:00
Arokha Sieyes
e6d767d309 mend 2016-06-03 23:15:09 -04:00
Spades
aa2c74aef5 Replaced mobs with vore versions. 2016-06-03 22:57:51 -04:00
Arokha Sieyes
307e261e72 Synth gets hit by axe? Internal bleeding. 
That'sa-no-good.
 2016-06-03 21:14:46 -04:00
Arokha Sieyes
02875c13da Fixed my own limbs. 
Herp derp.
 2016-06-03 20:44:27 -04:00
JoanRisu
6c41a1aa7a Prototype code for Crestrose, added code for scisword, and moved some fluff around. 2016-06-03 11:06:31 -07:00
Spades
f2d38db655 Merge pull request #279 from JoanRisu/Fluff_Items_worshop 
Fluff Items Workshop
 2016-06-03 10:54:47 -04:00
Spades
870c1d55ab Merge pull request #280 from VOREStation/custom-species-274 
Fixes Issue #274 - Preserves custom species when being cloned.
 2016-06-03 10:53:39 -04:00
Leshana
dd4a11ad5a Fixes Issue #274 - Preserves custom species when being cloned. 2016-06-02 18:50:35 -04:00
JoanRisu
20cca897bc Quick syntax amendment because dream maker didn't catch it. 2016-06-02 15:50:25 -07:00
JoanRisu
f80f97e52f Code for new fluff items plus some sprite name amendments. 2016-06-02 15:37:16 -07:00
Leshana
daf84d07af Merge pull request #275 from Arokha/fixes 
Fixes 2 issues
 2016-06-02 01:39:09 -04:00
Arokha Sieyes
a91499cec5 Ok, actually, good catch on that one Travis. 2016-06-01 23:18:34 -04:00
Arokha Sieyes
42107cda37 Fixes CentCom IDs. 2016-06-01 23:06:10 -04:00
Arokha Sieyes
b42c799e2c Oops. 2016-06-01 20:59:13 -04:00
Arokha Sieyes
fb31df39f2 Fixes #259 2016-06-01 19:15:34 -04:00
JoanRisu
ee8232942a Testing this out 2016-06-01 09:20:22 -07:00
Arokha Sieyes
655ba2fd50 Fixes #268 2016-06-01 11:06:57 -04:00
Poojawa
f07c184698 sprite fix 
I love terrible coder laziness, don't you?
 2016-06-01 03:38:13 -05:00
Poojawa
1f61c1097d Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-01 03:37:27 -05:00
Arokha Sieyes
ff1fc7ec91 Fluff stuff for meee. 2016-05-31 23:27:56 -04:00
Arokha Sieyes
595d1f77f2 Merge pull request #261 from Arokha/sync 
Polaris Sync
 2016-05-31 21:22:43 -04:00
Arokha Sieyes
4dd056763e Merge pull request #260 from JoanRisu/master 
Fluff for the Flufflings
 2016-05-31 21:12:58 -04:00
Arokha Sieyes
81748274af Merge pull request #258 from VOREStation/designs-unit-test 
Add a unit test which verifies research designs' materials lists
 2016-05-31 21:12:38 -04:00
Arokha Sieyes
3a9fa671a1 Map add and fbp tweak 2016-05-31 21:10:25 -04:00
JoanRisu
bde7a6cb50 More fluff for the flufflings 2016-05-31 17:48:26 -07:00
Leshana
604770a557 Fixes a bad material discovered by the new unit test! 
* "mutagen" is a reagent, not a material; it goes in the chemicals list.
 2016-05-31 20:38:07 -04:00
Leshana
d2f3179784 Add a unit test which verifies all research designs' materials lists and chemicals lists contain only valid materials and reagents. 2016-05-31 20:28:10 -04:00
Arokha Sieyes
50e5846603 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2016-05-31 18:54:18 -04:00
Arokha Sieyes
f23035c9ed Make Exosuit Fabs Great Again 
S'what I get for copypasting suggestions I guess.
 2016-05-31 18:45:08 -04:00