Commit Graph

19132 Commits

Author SHA1 Message Date
Arokha Sieyes
dd21b0c56b Merge pull request #2627 from Cyantime/paths
Updates expeditionary paths due to Polaris change
2017-12-26 13:42:10 -05:00
Arokha Sieyes
c96100aeac Merge pull request #2629 from VOREStation/aro-niffix
Fix NIF surgery post-update
2017-12-26 13:41:24 -05:00
Arokha Sieyes
fe2d09f17a Fix NIF surgery post-update
This line was put into the wrong block (a good example of why relative pathing is bad, since it made it unclear where it was before in normal code).
2017-12-26 01:50:04 -05:00
Cyantime
9e573e69fb Updates paths due to Polaris change 2017-12-25 22:31:01 -05:00
Arokha Sieyes
db16af261a Improves NIFSoft heatsink for synths
Wow, this ran out super fast. You get like 2 minutes of use, jeez. This makes it much longer. You also get a % heat sunk thing next to it in the NIF menu so you can see how far along you are.
2017-12-24 23:40:34 -05:00
Arokha Sieyes
1efb7bfa7c Merge pull request #2592 from Cameron653/SYNC_OY_VEY
Mid December Polaris Sync
2017-12-24 15:35:55 -05:00
Arokha Sieyes
41e460d62b Merge pull request #2608 from Screemonster/fixtheferalness
Xenochimera bugfixes and tweaks
2017-12-24 15:35:36 -05:00
Arokha Sieyes
85972435d8 Merge pull request #2611 from Cameron653/TESHARI_TOGGLE
Adds a proc to toggle passtable
2017-12-24 12:31:53 -05:00
Cameron653
97d4b9ef72 Move to IC tab. Clarity. 2017-12-24 02:43:24 -05:00
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
Screemonster
8464285ed4 HELL SPAWN 2017-12-23 21:46:10 +00:00
Abbie Fland
6854cfe8b0 Fixed pAI OOC info
Previously, pAI OOC info didn't appear to be getting set correctly,
whether installed through the normal recruit dialog or through an
observer directly inhabiting a loose pAI card.

There was a VOREStation-specific check during pAI creation to copy over
OOC info from preferences, but I tested multiple ways and it didn't seem
to ever succeed.

This change moves that check from creation to login.
2017-12-23 16:15:53 -05:00
killer653
b04d52cc9f Adds a toggle pass table proc
Can be given to any mob via VV. Teshari get the proc.
2017-12-23 14:23:52 -05:00
Arokha Sieyes
b201cf5125 Merge pull request #2593 from VOREStation/aro-movefile
Move VORE borg modules into more correct file
2017-12-22 21:23:09 -05:00
Screemonster
b06be78a87 fixes revive, feral, purge 2017-12-22 21:10:55 +00:00
Cameron653
30c18e8009 It's RED not PURPLE 2017-12-22 02:15:02 -05:00
killer653
3a2093ef40 Polaris sync 2017-12-21 04:01:07 -05:00
Arokha Sieyes
eb084adb0d Move VORE borg modules into more correct file
The normal ones are in station.dm, ergo the overrides and additions should be in station_vr.dm in the same folder, not in a mysteriously-named file in another folder.
2017-12-21 02:21:45 -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