Leshana
67f85d1f90
Minor fixes to Polaris Merge
...
* Fixes human HUD init so we still get all HUD variables filled. - TODO - Make our own versions of synthetic HUD for other hud categories if we ever feel like it.
* Re-removed gameticker sound code, this time marked it as VOREStation edit (wasn't marked before)
* Removed duplicate mutable_appearance type now that it is moved to mutable_apperance.dm
2017-12-23 21:54:07 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
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
Spades
37aa4dbe43
Merge pull request #2579 from VOREStation/aro-warnfix
...
Fix compile warning
2017-12-18 05:22:53 -05:00
mistyLuminescence
9a86b05471
Grind up some more stuff! ( #4423 )
...
*More types of sheets can be ground up in a grinder
2017-12-17 13:43:10 -08:00
Verkister
d83b142603
More missed limb icon null checks.
...
-Should probably decrease crashing even further.
2017-12-17 14:32:58 +02: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
Arokha Sieyes
7c26e03d52
Reenable organ rejection but make it work correctly
...
Based on the name of the species, rather than datum, so printed/former bodies of the same species used as donors (or anyone with the same species name, really, if you want to do certain things, like "Chakat" organs would be compatible with each other).
2017-12-16 11:23:37 -05:00
Spades
c2d2be8d96
Merge pull request #2576 from Verkister/freakyinvisiblemobs
...
More voremob override fixes.
2017-12-16 08:30:59 -05:00
Spades
2a79f2f044
Merge pull request #2572 from Cameron653/EGGS
...
Custom Egg Implant
2017-12-16 08:30:43 -05:00
Spades
82a351efc7
Merge pull request #2556 from Verkister/markenings
...
Some markings tweaks and such.
2017-12-16 08:29:49 -05:00
Spades
0deaeab192
Merge pull request #2553 from Cameron653/CUSTOM_IMPLANT
...
Custom implant
2017-12-16 08:29:28 -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
Cameron653
91df60a30d
Makes galoshes shockproof
2017-12-15 19:37:56 -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
Atermonera
32e9e0a602
Merge pull request #4201 from Anewbe/necrosis_surgery
...
Surgery updates
2017-12-13 19:57:06 -08: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
killer653
5736f590c9
Gives a player an egg implant.
2017-12-13 20:22:02 -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
Anewbe
3b89c5e320
Merge pull request #4384 from Belsima/maid
...
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
Anewbe
c0615e47cf
Merge pull request #4437 from Belsima/whatifgammer
...
more grammer
2017-12-12 19:31:06 -06:00
Anewbe
393144068e
Merge pull request #4427 from MisterLayne/fear_of_needles
...
Trypanohpobia
2017-12-12 19:30:01 -06:00
Anewbe
f32361350b
Merge pull request #4432 from Atermonera/VR_Exit
...
Moves Exit VR verb to avatars
2017-12-12 19:27:29 -06:00
Neerti
1066e14790
Merge pull request #4422 from Anewbe/utilities
...
Removes the military clothing from the loadout, repaths things
2017-12-12 20:16:33 -05:00
MisterLayne
ccc88ed9d1
Fear the needle (in that person's hand, too).
2017-12-12 16:18:33 -05:00
Belsima
430746d863
more grammer
2017-12-11 20:33:59 -05:00
