Commit Graph

8529 Commits

Author SHA1 Message Date
Spades
54b5d74ada Revert "Chirret species" 2017-12-19 19:47:50 -05:00
Cameron653
b7d0c61cee Merge branch 'master' into CHIRRET_SPECIES 2017-12-18 19:48:38 -05:00
killer653
55c8c8a6fb Merge remote-tracking branch 'refs/remotes/VOREStation/master'
# Conflicts:
#	icons/mob/human_races/markings_vr.dmi
2017-12-17 04:06:35 -05:00
Cameron653
18a56c89ca Update emote_vr.dm 2017-12-16 13:11:40 -05:00
Arokha Sieyes
c226fa2627 Fix compile warning
Cyantime removed the uses of this var but didn't remove the definition, so this removes that too, to prevent that compiletime warning.
2017-12-16 11:28:18 -05:00
Spades
c2d2be8d96 Merge pull request #2576 from Verkister/freakyinvisiblemobs
More voremob override fixes.
2017-12-16 08:30:59 -05:00
Spades
82a351efc7 Merge pull request #2556 from Verkister/markenings
Some markings tweaks and such.
2017-12-16 08:29:49 -05:00
Verkister
9e9a07fdef Update carp.dm 2017-12-16 10:34:23 +02:00
Verkister
5c2c21e9ee Merge branch 'freakyinvisiblemobs' of https://github.com/Verkister/VOREStation into freakyinvisiblemobs 2017-12-16 10:33:08 +02:00
Verkister
c72fb28eb1 Adds vore icons for big carp and xeno praetorian 2017-12-16 10:28:57 +02:00
killer653
55230a5b1f More edits! 2017-12-15 22:12:28 -05:00
killer653
f099a16854 no flying 2017-12-15 21:27:15 -05:00
killer653
fee01f89b1 Adjustments 2017-12-15 21:19:10 -05:00
killer653
c6791e821d Info 2017-12-15 21:08:30 -05:00
killer653
b91a3c0ea7 Chirret Edits 2017-12-15 19:31:42 -05:00
killer653
80db0e7822 Merge remote-tracking branch 'refs/remotes/VOREStation/master' into CHIRRET_SPECIES 2017-12-15 19:31:26 -05:00
Arokha Sieyes
860e833fd9 Merge pull request #2555 from VOREStation/aro-doglist
Tweak dogborgs
2017-12-15 18:48:08 -05:00
Verkister
b2ec986ad0 Update carp.dm 2017-12-15 09:16:59 +02:00
Verkister
ad492e3dfd More voremob override fixes.
-Disables vore icon overriding from xeno praetorian and mother. (no full icons yet)
-Fixes some type shenanigans in carp overrides.
-Great white overrides moved to the right type. (large/huge)
-Fixed icon naming for the regular big carp. (non-huge /large type on base code)
2017-12-15 09:15:41 +02:00
killer653
3d93a9d3f4 TYPOS 2017-12-14 23:14:24 -05:00
killer653
d80d8d9ccc WHOOPS 2017-12-14 23:06:35 -05:00
killer653
4bf7fc6d21 Sleep 2017-12-14 22:55:27 -05:00
killer653
7f70702f58 WIP. 2017-12-14 22:54:01 -05:00
Spades
bb67de3e14 Merge pull request #2552 from Verkister/otieshitt
Small otie opdates.
2017-12-14 08:57:39 -05:00
Spades
0f65eb8c55 Merge pull request #2566 from Verkister/borgoports
Some dogborg equipment fixes.
2017-12-13 22:20:37 -05:00
Spades
801cfbb383 Merge pull request #2548 from Cyantime/slimeflip
Slimes that fail to *flip lose limbs
2017-12-13 22:18:00 -05:00
Spades
09094619b2 Merge pull request #2544 from Cameron653/PR_IN_WHICH_XENOCHIMERA_CAN_CHOOSE_THE_CUSTOM_SPECIES_ICON_THEY_WISH_TO_HAVE_SO_THEY_AREN'T_STUCK_AS_A_TAJARAN_FOR_THE_REST_OF_TIME
Allows xenochimeras to choose icon base
2017-12-13 22:17:36 -05:00
Verkister
ac83cb89ad Fixes great white and xeno empress vore icons.
-The paths had been changed and overridden.
2017-12-13 14:28:38 +02:00
Verkister
6f86f8418e removed ert flash too 2017-12-13 11:41:21 +02:00
Verkister
38f4ac8d5e removed k9 flash 2017-12-13 11:39:27 +02:00
Verkister
017509f36e removed medihound mini extinguisher 2017-12-13 11:36:56 +02:00
Verkister
cb9057befa Some dogborg equipment fixes.
-Fixes dogborgs and such not getting the basic starter tools.
-Readds sec and med huds for accessing records and such.
2017-12-13 11:26:52 +02:00
Verkister
1b165c36a3 Some markings tweaks and such.
-Fixes the side view arms on cow body markings.
-Adds the wider sorta sergal base eyes as markings (for custom species etc)
-Adds vulp snout stripe marking (like the vulpine facial without the rest of snout)
-Adjusts teshari hair highlights to better match our multiply body hair stuff.
2017-12-09 11:15:12 +02:00
Arokha Sieyes
ac2729b445 Tweak Dogborgs (drugs, etc) 2017-12-08 18:18:57 -05:00
Verkister
e23b9567f5 Small otie opdates.
-Makes all oties peacefully accept all food offerings, not just sec ones and not just donuts.
-Food offerings that aren't sec+donut only have 2% chance of prey release though.
-Makes sec oties not consider people without records as threats (should have guest pass folks safe now I think even though I do blame that incident on the person wearing a mask while at it for whatever reason)
-Adds a phoron version of the sec pup (outdoors-proof geared up feral mutant look, currently unobtainable though)
2017-12-06 20:15:29 +02:00
Cyantime
92810ee90a Slimes that fail to slip lose limbs 2017-12-03 01:13:55 -05:00
Cyantime
e93c28eb6d Removes doubled AI hologram messages 2017-12-03 00:34:29 -05:00
Cameron Lennox
4856786ceb Makes xenochimera able to select "Xenochimera" 2017-12-02 19:08:12 -05:00
Cameron Lennox
755f8828a6 Allows xenochimeras to choose icon base 2017-12-02 16:04:20 -05:00
Dinnel
5982074d94 Forgot to add the comment in there. 2017-12-02 11:53:43 -06:00
Dinnel
748c2ac50f Update pai.dm 2017-12-02 11:49:25 -06:00
Spades
7551b4594a Merge pull request #2537 from Runa-Dacino/Gender-Fluid
Adds ability to change gender identity mid-round
2017-12-01 20:15:41 -05:00
Spades
ecba65d9fc Merge pull request #2536 from Cyantime/borglang
Adds VOREStation specific languages to silicons.
2017-12-01 14:20:01 -05:00
Runa Dacino
a872500490 Adds ability to change gender identity mid-round (#1)
* Adds the ability to toggle gender identity in game

Adds the ability to toggle gender identity freely while playing the character.

* Fixes compiler error, gets it to work

* Adds changelog.
2017-12-01 01:17:21 +01:00
Cameron653
92afd5e970 Merge pull request #2525 from Cyantime/revert-2389-weakmouse
Revert "Makes mice unable to push things around."
2017-11-30 16:25:07 -05:00
Cyantime
61f1990086 This is important I guess? 2017-11-29 22:40:18 -05:00
Cyantime
2ce91bceef Allows silicons to use the added languages 2017-11-29 21:44:20 -05:00
Cameron653
3d09943e7b Makes VASILISSANS not get cut by glass
Jesus. That name is insane to search up.
2017-11-28 21:12:40 -05:00
Cyantime
954869c99e Revert "Makes mice unable to push things around." 2017-11-27 14:48:04 -05:00
Cameron653
d86cd37e95 Merge pull request #2515 from Cyantime/Slimehair
Allows prometheans to change their hair color seperately from body color, and also headpat
2017-11-26 15:40:55 -05:00