cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,392 Commits 6 Branches 0 Tags
1a11d26ae26a4bac2c57a062c31cb86c6b53baf6
Commit Graph

23388 Commits

Author SHA1 Message Date
Cameron653
1a11d26ae2 Fixes \red 2016-06-08 18:42:00 -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
Datraen
8c50a92338 Merge pull request #1889 from Yoshax/bullets 
Fixes many dense objects from stopping penetrating bullets
 2016-06-07 18:35:22 -04:00
Cameron653
c5d3883ef5 Create prometheans_vr.dm 2016-06-07 15:08:17 -04:00
Kearel
d21841a92e Lets spears be made from butterfly knifes as well as shards. 2016-06-07 19:42:11 +01:00
HarpyEagle
4cf0d2bad1 Fixes many dense objects from stopping penetrating bullets 2016-06-07 19:30:21 +01:00
PsiOmegaDelta
457b4cc367 Large crates now insert items on initialization. 
Similar to how crates/lockers do it.
 2016-06-07 19:06:45 +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
94a0e186af Now stores seeds properly by checking names and assigning names on storage, instead of just putting them all under "Fruit" 2016-06-06 22:38:09 -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
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
Anewbe
1d04b9ca1f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into fbp_sans_science 2016-06-06 16:39:59 -05: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
Datraen
24d5769b02 Merge pull request #1880 from PolarisSS13/05_Jun._Increase_snowflake 
Increases loadout points
 2016-06-06 11:46:28 -04: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
baf8ca5dcc These were supposed to be removed. 
We scrapped this change.
 2016-06-05 22:24:35 -04:00
Spades
3b44024e88 Reverts ammo change, fixes P90 2016-06-05 17:55:39 -04:00
Jon
941aadae53 Increases loadout points 10 -> 15 to account for the steady increase in items, especially those that most people want to take anyway like lunchboxes and communicators. 2016-06-05 22:44:16 +01: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
Spades
f6497ee60d Changelog says I changed this but I didn't. 2016-06-05 13:40:37 -04:00
Datraen
fa74226e99 Merge pull request #1844 from SpadesNeil/GunsGunsGuns 
Guns, Guns, Guns (Now in a PR less stupid)
 2016-06-05 13:25:26 -04:00
Spades
9da3e9bac7 Comment corrections to clear confusion. 2016-06-05 13:18:07 -04:00
Datraen
45e71a1825 Merge pull request #1871 from SinTwo/power_monitor_fix 
Power monitor fix
 2016-06-05 10:53:14 -04:00
Anewbe
ecc902a811 Removes species restrictions on shoes and gloves for Taj and Unathi 2016-06-04 16:05:05 -05:00
Neerti
4fec35ab91 Merge pull request #1873 from Yoshax/mapchanges 
Robotics slight adjustments
 2016-06-04 11:24:50 -04:00
Yoshax
ac3a1bd691 Robotics slight adjustments 2016-06-04 15:08:01 +01: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
Spades
037271504e No five-round burst! I thought I removed these! 2016-06-04 01:36:56 -04:00
Anewbe
cdb5966576 Tweaks FM-2t to possibly be usable, fixes its single-shot mode, too 2016-06-03 23:58:00 -05:00
SinTwo
56b35a9528 icon update 2016-06-04 00:31:15 -04:00