cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,240 Commits 8 Branches 26 Tags
ca6ae06ecff22dc1135ab6a83bf4e26a0a1bf60e
Commit Graph

14360 Commits

Author SHA1 Message Date
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
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
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
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
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
Arokha Sieyes
925b1b4a3e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/game/mecha/mech_fabricator.dm
 2016-05-31 18:17:58 -04:00
Arokha Sieyes
bf3b350ee3 Readd shrink ray, fix material requirement on ex drill 2016-05-31 18:10:30 -04:00
Mechoid
7bcd041e09 Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand. 2016-05-31 14:30:17 -07:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter 
Make FBPs Constructable
 2016-05-31 15:50:32 -04:00
Datraen
c75512aa75 Xenobio2 Update #3 (#1832) 
* Adds growth inspection to the trait scanner, lowers mutation and growth levels.

* Adds NutriMaxes to Xenobiology, for feeding the slimes.

* Fixes a typo
 2016-05-31 18:30:52 +01:00
Broseph Stylin
4518e22be2 Small update to double beds. (#1828) 
* Corrects a typo because I'm dumb.

* Adds double bed recipe to appropriate materials.
 2016-05-31 15:08:57 +01:00
Datraen
caac4c5838 Randomized Plant Update (#1805) 
* Plants now use a ban list instead of an approved.

This means that most reagents can be synthesized by plants.

Also added a name generator for strange seeds, based off of a bit of
lipsum and a bit of various plant genus and descriptors.

# Conflicts:
#	code/modules/hydroponics/seed.dm

* Removes # sign
 2016-05-31 15:08:42 +01:00
Poojawa
f3208c2a5b Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-31 05:38:05 -05:00
Mark9013100
d7624b2b15 Adds a few more accessories 2016-05-31 06:16:05 -04:00
Arokha Sieyes
54272da167 Merge pull request #245 from VOREStation/sink 
Synchronize With Polaris
 2016-05-31 01:35:04 -04:00
Leshana
3fbd3c8020 Merge remote-tracking branch 'tmp/Xenobio2Update2' into sink 2016-05-31 00:23:44 -04:00
Datraen
c1c3110496 Xenobio2 Update 
Adds the trait scanner, which I had thought was previously added.
Fixes the smartfridge not believing that it had the cores in it's inventory.
Fixes an inverted check.
 2016-05-30 23:44:53 -04:00
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
Mark9013100
9aecdce655 Adds more ties to loadout, strangulation not included 2016-05-30 17:00:31 -04:00
Cameron653
d4c16be569 Adds in a language implant. 2016-05-30 16:59:57 -04:00
Spades
26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812) 
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
 2016-05-30 19:19:45 +01:00
Poojawa
ffda6862b1 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-30 09:34:02 -05:00
Poojawa
9db78484d0 Merge branch 'refs/heads/vulparace' 2016-05-30 09:33:53 -05:00
Arokha Sieyes
6283dcdc86 Merge pull request #204 from Poojawa/vulparace 
Vulparace
 2016-05-30 02:43:08 -04:00