cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-24 00:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,438 Commits 11 Branches 0 Tags
1a71b0ea53c337be344a07a4a8f63dff6ae052bf
Commit Graph

14454 Commits

Author SHA1 Message Date
Cameron653
1a71b0ea53 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-09 20:28:21 -04:00
Cameron653
0344114872 Makes weight not be "they are" anymore. 2016-06-09 15:34:12 -04:00
Cameron653
49ebf37c72 Final fix 2016-06-09 02:48:54 -04:00
Cameron653
8172737fc9 Byond and travis hate .1 2016-06-09 02:44:23 -04:00
Cameron653
c99c1db0a1 TF clarification since not everyone 
does womb TF, and some people are against UB.
 2016-06-09 02:38:30 -04:00
Cameron653
91a77e5bb9 Severely nerfs prometheans heal rate 2016-06-09 01:51:45 -04:00
Cameron653
f9ac5f3bfa Fiiixesss 2016-06-09 01:31:49 -04:00
Cameron653
816255fed4 Allows prometheans to actually change into all species 2016-06-09 01:27:13 -04:00
Cameron653
37933d379c Fixes runtime bug 2016-06-09 01:20:30 -04:00
Cameron653
34cb7929c7 Allows Prometheans to use spacesuits. 2016-06-09 01:06:59 -04:00
Arokha Sieyes
f98c9dbce8 Merge pull request #323 from Cameron653/master 
Adds slimecore reactions and gives slimes a greater chemical pool to choose from.
 2016-06-08 22:08:07 -04:00
Spades
030adfc39f Derp. 2016-06-08 21:09:36 -04:00
Spades
4c1dba268e Gun fixes. 
Brings all our guns up to date.

- Cresent Rose no longer uses redundant ammo type. It uses 5.56 ammo.
- Fixes names and descriptions.
- Fixes bad origin tech vars.
- Fixes missing allowed_magazines var.
- Fixes battle rifle ammo icon.
- Fixed missing STG ammo icon.
- Added some other missing icons for later.
 2016-06-08 20:01:20 -04:00
Cameron653
dd12233925 Update Chemistry-Recipes_vr.dm 2016-06-08 19:02:27 -04:00
Cameron653
91d024288e This should fix \blue 2016-06-08 18:46:35 -04:00
Cameron653
1a11d26ae2 Fixes \red 2016-06-08 18:42:00 -04:00
Arokha Sieyes
cef08710b2 Fix several fluff items 2016-06-08 16:58:43 -04:00
Arokha Sieyes
b3e0a7bc30 Merge branch 'master' of https://github.com/VOREStation/VOREStation into bagfix 2016-06-08 13:49:12 -04:00
Spades
4b9eeec946 Merge pull request #320 from VOREStation/synthgurgles 
Tweaks digestion code
 2016-06-08 13:36:15 -04:00
Cameron653
203d294400 Gives slimes a greater chemical pool 2016-06-08 08:37:02 -04:00
Cameron653
700222f40a Travis refused to work while these were in, so I 
Had to remove them. I can possibly bring them back sooner or later, but
not right now.
 2016-06-08 02:57:16 -04:00
Cameron653
92e1f0856f Travis, please. 2016-06-08 02:54:58 -04:00
Cameron653
fbec152c6a Travis should work, now. 2016-06-08 02:51:50 -04:00
Cameron653
6d3f9be055 Makes the code a bit better 2016-06-08 02:44:31 -04:00
Cameron653
2b380da2ae Looking back, fire should cost more. 2016-06-08 02:22:30 -04:00
Cameron653
8c92c1b25b Adds in "slime core" reactions to xenobiology 2016-06-08 02:15:10 -04:00
Arokha Sieyes
eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync 
# Conflicts:
#	vorestation.dme
 2016-06-07 18:37:47 -04:00
Arokha Sieyes
c625a7515e Tweaks digestion code 
Makes synths digest more gracefully and actually preserves MMIs like intended
 2016-06-07 18:20:52 -04:00
Cameron653
c5d3883ef5 Create prometheans_vr.dm 2016-06-07 15:08:17 -04:00
HarpyEagle
4cf0d2bad1 Fixes many dense objects from stopping penetrating bullets 2016-06-07 19:30:21 +01: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
Datraen
fe7c079747 Merge pull request #1879 from SpadesNeil/revert-ammo-fix-p90 
Reverts ammo change, fixes P90, changes SVD mag name
 2016-06-06 22:17:01 -04:00
Spades
e51da6c35b Renamed SVD mag to be consistent per request. 
It's just a 10 round 762 magazine. It's compatible with the STS.
 2016-06-06 22:03:03 -04:00
Arokha Sieyes
0422a4bcd4 Updates my fluff bag. Less gun, more knife. 2016-06-06 21:49:25 -04:00
Arokha Sieyes
df4c821984 Merge pull request #312 from JoanRisu/Fluff_Items_worshop 
fluff adjustments
 2016-06-06 21:37:34 -04:00
Anewbe
3fec6418dc Eyes and cells don't require research 2016-06-06 19:47:54 -05: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
Anewbe
a7deb7e6aa Removes the science requirements from creating prosthetic torsos and heads 2016-06-05 22:16:50 -05: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
Spades
3b44024e88 Reverts ammo change, fixes P90 2016-06-05 17:55:39 -04:00
Datraen
a5c615cbd1 Merge pull request #1872 from Anewbe/energy_burst_change 
Tweaks FM-2t to possibly be usable
 2016-06-05 13:58:32 -04:00