Commit Graph

17762 Commits

Author SHA1 Message Date
Verkister
73f450465f Makes vore organ transfer use the target organ's sound.
-Ye it's no longer hardlimited to squish2.ogg
2017-08-25 16:04:01 +03:00
Spades
cc6e0ce96b Merge pull request #2058 from VOREStation/WING_DESIGNER_FIX
Should fix designer tails being unselectable.
2017-08-25 01:24:21 -04:00
Spades
668078ed08 Merge pull request #2054 from Verkister/spampanels
Auto-updates for vore panel and borgo gut UI.
2017-08-25 01:24:10 -04:00
Spades
26d52b576a Merge pull request #2026 from Gearshy/master
Shock collars now come with exciting shocking action!
2017-08-25 01:23:11 -04:00
Spades
a43c1d408c Merge pull request #2037 from Cameron653/master
Adds Xenneth custom ID.
2017-08-25 01:23:01 -04:00
Cameron653
947b38a7f1 Should fix the wings 2017-08-24 22:43:55 -04:00
Verkister
f846437db5 I think I figured out the shuttle issue.
-No, the line 84 did not replace or relate to the timer part you commented out.
-Due to condition mismatch of some sort, the code skipped the line 84 stuff, moving onto the next thing below, slapping the shuttle through instantly because of the timer having been commented out
2017-08-24 21:23:39 +03:00
Verkister
20e2b78963 Proper shutdown for borgo refreshing. 2017-08-24 15:56:52 +03:00
Verkister
1d266509ae Auto-updates for vore panel and borgo gut UI.
-Vore panel now automatically refreshes when belly contents enter or leave.
-Updates only happen when the panel is open.
-Should also work from the prey's perspective.
-Borgo sleeper UI also does that now.
-Clicking the borgo gut while active toggles the UI updates.
-Hacky shit lmao but I need to pass out again like 2 hours ago so goodnight.
2017-08-24 02:46:57 +03:00
killer653
eb48f05509 Adds Xenneth custom ID 2017-08-20 21:28:16 -04:00
Gearshy
c19a3c648d Collar icons 2017-08-16 21:11:31 +02:00
Gearshy
a148ffed55 Final-ish pass on shock collars. 2017-08-16 20:50:34 +02:00
Gearshy
42801b9abc Shock Collars: The Empire Strikes Back 2017-08-16 18:07:07 +02:00
Gearshy
652749a0b8 Part four of the shock collar saga, and more cleanup. 2017-08-16 16:16:48 +02:00
Gearshy
31de112699 Third time is the perfect time for minor cleanup. 2017-08-16 15:02:08 +02:00
Gearshy
e0f373efd3 Shocking collars, take two. 2017-08-16 14:33:38 +02:00
Gearshy
34a025e1d2 Shock collars, how SHOCKING! 1/? 2017-08-16 14:00:20 +02:00
Cyantime
499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
Spades
0d5bc38ddf Merge pull request #2015 from Verkister/feedtheborgo
Enables vore organ borgo fueling.
2017-08-15 01:22:35 -04:00
Spades
35c6cbd8b5 Merge pull request #2017 from Cyantime/catbuff
Buffs cat mouse-catching capabilities.
2017-08-15 00:08:47 -04:00
Cyantime
9f268bca33 Buffs cat mouse-catching capabilities. 2017-08-14 21:36:31 -04:00
Verkister
fe6cf21850 Enables vore organ borgo fueling.
-Borgs now gain recharge juice from vore organ gurgles.
2017-08-15 00:19:06 +03:00
killer653
e59bb743c7 Fixes spider hair&markings 2017-08-14 16:32:55 -04:00
Spades
2dfe50bc1b Merge pull request #2008 from Cyantime/decontam
Contaminated items no longer deal damage if they are in a belly.
2017-08-14 04:16:45 -04:00
Spades
0a808a5cb4 Quick text hotfix 2017-08-14 04:04:51 -04:00
Cyantime
9a6b86cb9b Stop poisoning yourself 2017-08-14 02:22:42 -04:00
Cameron653
010dce2056 Merge pull request #2007 from Cameron653/SPIDER_RACE
Fixes a gamebreaking oversight related to spider and xenochimera age.
2017-08-14 02:02:10 -04:00
Cameron653
0ba9752202 Forgot to change these when I initally copy and pased them. 2017-08-14 01:13:40 -04:00
Spades
e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Spades
0d24be30ea Merge pull request #2002 from Yoshax/1234
Fixes Promethean Humans looking really, really bad
2017-08-13 20:55:19 -04:00
Yoshax
b3c2cea59c Fixes Promethean Humans looking really, really bad 2017-08-13 21:48:41 +01:00
Cameron653
38a496cfb4 Update station_special_vr.dm 2017-08-13 10:42:15 -04:00
Verkister
5ff61bea4c Merge branch 'master' of https://github.com/VOREStation/VOREStation into spriteshit
# Conflicts:
#	code/game/dna/dna2.dm
#	code/game/dna/dna2_helpers.dm
2017-08-13 15:21:22 +03:00
Verkister
22e6bcb520 Enables dual coloring for ears.
-Ya know how a bunch of the ear options have that untouchable bright white inner part?
-You can touch it now :D
-Also renames the ear color vars for better compatibility and consistency.(red/g/b_ear > r/g/b_ears etc)
2017-08-13 15:20:11 +03:00
Spades
2e22e7fd08 Merge pull request #1994 from Cameron653/MEDICAL_SLEEVEMATE
Lets medical borgs scan people.
2017-08-13 05:17:10 -04:00
Spades
cf00011e73 Merge pull request #1987 from Verkister/spriteshit
Accessory blend mode overhauls and some synth taurs.
2017-08-13 05:17:01 -04:00
Spades
ab0f2cd176 Merge pull request #1995 from Cyantime/tfrefactor
TF refactor
2017-08-13 05:16:40 -04:00
Spades
7b47cbc5ad Update organizations_vr.dm 2017-08-13 04:01:20 -04:00
Spades
6a29a35063 " 2017-08-13 02:36:46 -04:00
Spades
9fada8c3dd Changing this while I'm at it. 2017-08-13 00:29:25 -04:00
killer653
2104cfde9a Blurb update 2017-08-12 23:54:10 -04:00
killer653
731bea5001 Small edit 2017-08-12 23:52:08 -04:00
killer653
63c496e79c FIXES 2017-08-12 23:49:24 -04:00
Cameron653
d1de17240c Updates their name 2017-08-12 23:43:57 -04:00
killer653
32ee9af282 Adds spider-eyes 2017-08-12 23:17:59 -04:00
killer653
34a0cd094e Allows spiderlegs to be chosen as a "wing" selection 2017-08-12 23:07:07 -04:00
killer653
dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Cyantime
9637c6a0eb TF refactor 2017-08-12 20:53:52 -04:00
Cameron653
94b50a1299 Lets medical borgs scan people. 2017-08-12 20:32:49 -04:00
Cameron653
0ffd4673e6 Merge pull request #1993 from Cameron653/SIZE_GUN_FIX
Size gun fix
2017-08-12 20:13:27 -04:00