cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 06:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,167 Commits 8 Branches 26 Tags
488fdf85eccdfc61c7f1c212bc9d285a04594de8
Commit Graph

1634 Commits

Author SHA1 Message Date
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
Cameron653
d199552fa0 Egg transformation. A few bug fixes (#76) 
* 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!
 2016-05-16 19:16:35 -04:00
Arokha Sieyes
22802d40e6 Tweaks fluff items more, fixes a few visual/icon bugs 2016-05-15 23:30:36 -04:00
JoanRisu
091e175dd4 Fluff Items 3: The sequel to the sequel 
Mark as Done:
//scree:Scree
/obj/item/clothing/head/fluff/pompom

//zodiacshadow: ?
/obj/item/device/radio/headset/fluff/zodiacshadow

// OrbisA: Richard D'angelo
/obj/item/weapon/melee/fluff/holochain

//eekasqueak: Serkii Miishy
/obj/item/fluff/permit/serkiimiishy

// bwoincognito:Tasald Corlethian
/obj/item/clothing/suit/storage/det_suit/fluff/tasald

// bwoincognito:Tasald Corlethian
/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat

// joey4298:Emoticon
/obj/item/device/fluff/id_kit_mime

//General Use
/obj/item/weapon/flag

// bwoincognito:Tasald Corlethian
/obj/item/weapon/storage/box/fluff/tasald
name = "Tasald's Kit"

// jemli:Cirra Mayhem
/obj/item/weapon/storage/box/fluff/cirra

// joey4298:Emoticon
/obj/item/weapon/storage/box/fluff/emoticon

// joanrisu:Joan Risu
/obj/item/weapon/storage/box/fluff/joanrisu
 2016-05-15 19:00:56 -07:00
Arokha Sieyes
ece408d5a8 Merge pull request #58 from JoanRisu/master 
Fluff Items 2: Resurgance
 2016-05-14 19:46:47 -04:00
JoanRisu
f11ed9f8f4 hotfix 2016-05-14 16:28:25 -07:00
Arokha Sieyes
8319c8b1b1 More color macro removal 2016-05-14 13:52:40 -04:00
Arokha Sieyes
231ee5bf35 Work on satisfying travis 2016-05-14 13:38:24 -04:00
JoanRisu
44d6771a4c The Next Batch: Cont 
Github fucking unchecked this file for commit. >:c
 2016-05-14 02:33:23 -07:00
JoanRisu
6ebff50f04 The Next Batch 
scree:Scree:/obj/item/clothing/under/fluff/screesuit
molenar:Giliana
Gamish:/obj/item/clothing/suit/storage/toggle/labcoat/fluff/molenar

Needs to be added to custom items config list:
adk09:Lethe:/obj/item/clothing/head/helmet/hos/fluff/lethe

Item entries done, just needs a modkit:
scree:Scree:/obj/item/device/modkit_conversion/fluff/screekit

General custom items added:
/obj/item/clothing/suit/space/void/security/fluff/hos // ToDo: Rig
version.
/obj/item/clothing/head/helmet/space/void/security/fluff/hos // ToDo:
Rig version.
All Animatronic suits
 2016-05-14 02:32:50 -07:00