Commit Graph

393 Commits

Author SHA1 Message Date
Cameron653
c99c1db0a1 TF clarification since not everyone
does womb TF, and some people are against UB.
2016-06-09 02:38:30 -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
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
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
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
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
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
f3a4cc0205 Merge pull request #295 from JoanRisu/Fluff_Items_worshop
Fluff: Crescent Rose Revived!
2016-06-03 23:40:28 -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
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
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
Arokha Sieyes
ff1fc7ec91 Fluff stuff for meee. 2016-05-31 23:27:56 -04:00
JoanRisu
bde7a6cb50 More fluff for the flufflings 2016-05-31 17:48:26 -07:00
Arokha Sieyes
54272da167 Merge pull request #245 from VOREStation/sink
Synchronize With Polaris
2016-05-31 01:35:04 -04:00
Leshana
188dbfab59 Merge pull request #244 from Arokha/struggle
Fix struggle sounds
2016-05-29 16:27:48 -04:00
Leshana
e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
2016-05-29 16:22:07 -04:00
Arokha Sieyes
29bad6b935 Fix belly sounds. 2016-05-29 15:45:06 -04:00
Leshana
7bd3e1ddd0 Fix the on-mob icon for vulpine belt! Oops! 2016-05-26 21:40:10 -04:00
Leshana
985615d699 Fixes Issue #146 - Fix wrapping of belly buttons in vore panel if they exceed width of vore panel window. 2016-05-21 20:09:29 -04:00
Leshana
64fb673d69 Adds vixen belt fluff item. 2016-05-21 20:09:29 -04:00
Arokha Sieyes
803dff61f3 Fixes #134 2016-05-21 12:32:21 -04:00
Arokha Sieyes
79cf3390cc Fixes #140
Plays sound to prey directly (might be too loud? Edit if so.)
2016-05-21 11:44:05 -04:00
Cameron653
714273cd83 Github desktop client removed this for some reason? 2016-05-18 15:20:52 -04:00
Cameron653
e985f859dc Allows all the races to use all the hair styles.
With the exception of species specific hair styles.
Also lets species be bald if they want to be.
Reorganizes the ears, making colorable ones come last
Also adds in both Zorren ears
2016-05-18 15:20:31 -04:00
Cameron653
360913ee80 Fixes a bug that made hair colored tails not show
Also makes it more consistent. Instead of having "hair colored" and
"colorable", it's all "colorable"
2016-05-18 14:25:09 -04:00
Arokha Sieyes
3cd660d79d Fixes synths and sets null post-load prefs
Fixes digestion button missing, and synths overheating in a belly, and synth custom species
2016-05-18 01:36:14 -04:00
Leshana
c8289fd465 Fixes colorable custom accessories not being colorable. (#97)
* Previous attempt to make sprite_accessories datums configurable as to whether they should be blended by ICON_ADD vs. ICON_MULTIPLY failed because ICON_ADD's value is actually zero.  do_coloration was also checked to see if the sprite should be colorized at all.
* Thus a datum configured to use ICON_ADD (zero) didn't get colored at all!
* Fix separates the concept of "do/don't colorize" from  "blend mode to use when colorizing"
2016-05-17 22:43:49 -04:00
Cameron653
c2d5485fc5 Adds Zorren and also some major tail fixes. (#92)
* Adds Zorren. Tail fixes.

Exactly what it says on the tin.
Adds in both Zorren races.
Fixes species specific tails
Fixes hair colored species specific tails (partially)
Fixes hail colored tails (partially)
Fixes hail colored ears
Adds in more species related tails
(Ex: All the multiple xenomorph tails, monkey tail, stok tail, vox
armalis tail)
Note: For hair colored tails to fully work, they need to be greyscale.
This will require some editing later on, but for now, it works.

* ...Github didn't sync this for some reason.

* Fixes

* Fixes

* Fixes V2

Fix one bug
Cause 50 more

* Irrelevant
2016-05-17 20:34:52 -04:00
Arokha Sieyes
6c9a6264cf Gateway Icon Change + Fitness Center (#95)
* Shhh don't mind this.

* More gateway changes, also adds fitness room

Also gives the ability for some FBPs to have tails (we can sprite the tails later, it defaults to off)

* Issue #30 - Added icons and code for vore animals.

Also tweaked to be more in line with current codebase.

* Fix to leading space in alien.dm

* Makes Labyrinth.dmm compile and load in map editor. (#90)

Could use some work still though.
2016-05-17 20:03:45 -04:00
Cameron653
ef40afdaef Forgot to add add this part to vorepanel_vr
Quick and easy bugfix.
2016-05-17 14:11:43 -04:00
Cameron653
459a2d9840 Adds in "Encase In Egg" vore type. (#88)
* This compiles, has a debug in a few areas

But doesn't actually work in game

* This didn't go with the first sync. booo.

* Actually gets egg TF to work. Fixes spacesuit sprites

* Makes the borgs stomach show up

* More  bugfixes!

* Adds in "Encase in egg"

* I forgot to change this
2016-05-16 23:20:25 -04:00