cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 21:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,455 Commits 9 Branches 0 Tags
0433d9bf8305a70c06b34d60281c9aaa36d77eda
Commit Graph

23422 Commits

Author SHA1 Message Date
Spades
0433d9bf83 Derp. 2016-06-14 17:17:33 -04:00
Spades
1f48a98ba4 Official Vorestation SMG. *nodnod* 2016-06-14 17:16:29 -04:00
Spades
51be44fef0 PDW added 2016-06-14 17:11:57 -04:00
Cameron653
eba3e1bf27 Moth wings, non colorable. 2016-06-10 01:04:11 -04:00
Cameron653
91e247a75a Adds in a colorable moth wings. 
Sprited by Tk20634
 2016-06-10 01:02:51 -04:00
Spades
5694f545e0 Merge pull request #338 from VOREStation/Guns-Guns-Guns 
Fluff rifle casing icon fix
 2016-06-10 00:35:34 -04:00
Arokha Sieyes
b16d73d1da Merge pull request #341 from Cameron653/master 
Bugfixes and promethean nerf.
 2016-06-09 20:12:13 -04:00
Cameron653
0344114872 Makes weight not be "they are" anymore. 2016-06-09 15:34:12 -04:00
Spades
3d8621dcd6 Fixes the BR casing 2016-06-09 04:22:31 -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
3e5faabe0c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sank 2016-06-09 01:00:07 -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
Arokha Sieyes
c86ede43bd log_debug, even better. 2016-06-08 02:49:54 -04:00
Arokha Sieyes
a5995b8e21 Don't echo things to everyone on the server 
Nobody knows what to do about your hung object processing, sry.
 2016-06-08 02:47:34 -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
Neerti
945753fcac Merge pull request #1891 from Yoshax/johnmayer 
Increases stun time from falling due to gravity change
 2016-06-08 01:14:59 -04:00
Neerti
fa5dd08f2f Merge pull request #1893 from Yoshax/spears 
Spear fix + a change
 2016-06-08 01:14:05 -04:00
Yoshax
d076962c51 Spear fix + a change 2016-06-08 03:54:44 +01: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
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
6888fa1982 Increases stun time from falling due to gravity change 
It was ridiculously short, and strange to watch
 2016-06-07 19:48:48 +01: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