Commit Graph
37807 Commits
Author SHA1 Message Date
kcin2001andGitHub 7f4eec0cf9 adds harpy markings 2017-08-31 18:48:59 -07:00
kcin2001andGitHub 6f4050cf77 gooey harpies 2017-08-21 14:27:44 -07:00
kcin2001andGitHub f7b7f28b5c adds harpies 2017-08-21 14:26:23 -07:00
kcin2001andGitHub 5af3f4cc59 adds harpies to suits 2017-08-21 14:24:22 -07:00
kcin2001andGitHub 9f7c777c9d i forgot a quote 2017-08-21 14:21:12 -07:00
kcin2001andGitHub a766cc8ed0 Starting to add harpies (first with hair)
the first in many files and steps
2017-08-21 14:20:25 -07:00
kcin2001andGitHub cde1be5676 actually makes the colorable ones colorable 2017-08-21 12:23:35 -07:00
kcin2001andGitHub e8ad23dd04 fixed the tabbing issues and i fucked up commenting out stuff 2017-08-20 17:06:22 -07:00
kcin2001andGitHub 5262ed0855 uncomments out the colorable heads except for the sentinal 2017-08-20 17:02:43 -07:00
kcin2001andGitHub 10a5785080 fixes the black ones to use the right state 2017-08-19 18:04:00 -07:00
kcin2001andGitHub 1bcc9d98f8 adding better xeno heads 2017-08-18 20:17:20 -07:00
kcin2001andGitHub 64c928d153 Adds xeno heads to the ears file 2017-08-17 22:13:17 -07:00
kcin2001andGitHub 942d869625 Adds in xeno heads
need some assistance with colorable heads
2017-08-17 22:08:23 -07:00
SpadesandGitHub 678374bf91 Merge pull request #2027 from VOREStation/map-hotfix
More map hotfixes
2017-08-17 20:14:13 -04:00
Spades 231a79ab0e Fixes the syndie shuttle's nanomed too 2017-08-16 17:59:49 -04:00
Spades ea6df554f7 Trader shuttle hotfixes
- Fixes nanomed vending machine density.
- Removes mateba.
2017-08-16 17:24:52 -04:00
Spades 8cc26cef05 Merge remote-tracking branch 'refs/remotes/origin/master' into map-hotfix 2017-08-16 17:18:32 -04:00
SpadesandGitHub b654ff2a08 Merge pull request #2023 from VOREStation/map-hotfix
Fixes vault door button, again
2017-08-15 22:06:37 -04:00
Spades 0aa6a5da31 Fixes merc shuttle stuff 2017-08-15 21:36:03 -04:00
Spades 8c16b80151 Fixes vault door button, again
:T
2017-08-15 17:16:52 -04:00
Spades a0956048b9 Merge remote-tracking branch 'refs/remotes/origin/master' into map-hotfix 2017-08-15 17:14:47 -04:00
SpadesandGitHub 0d5bc38ddf Merge pull request #2015 from Verkister/feedtheborgo
Enables vore organ borgo fueling.
2017-08-15 01:22:35 -04:00
SpadesandGitHub 10f4da1153 Merge pull request #2019 from VOREStation/map-hotfix
More map fixes
2017-08-15 00:09:09 -04:00
SpadesandGitHub 595643a553 Merge pull request #2018 from VOREStation/revert-2003-mousespawn
Revert "Trash piles can now spawn mice"
2017-08-15 00:08:58 -04:00
SpadesandGitHub 35c6cbd8b5 Merge pull request #2017 from Cyantime/catbuff
Buffs cat mouse-catching capabilities.
2017-08-15 00:08:47 -04:00
SpadesandGitHub ff37ff0e30 Merge pull request #2016 from Jakksergal/master
More Engineering fixes and adjustments.
2017-08-15 00:08:33 -04:00
SpadesandGitHub 748d97305f Merge pull request #2014 from Cameron653/SPIDER_TEST
Fixes spider hair &markings
2017-08-15 00:07:45 -04:00
Spades 66c658acd5 Mpre map fixes 2017-08-14 23:15:47 -04:00
SpadesandGitHub 60ead7642d Revert "Trash piles can now spawn mice" 2017-08-14 23:07:08 -04:00
Cyantime 9f268bca33 Buffs cat mouse-catching capabilities. 2017-08-14 21:36:31 -04:00
Jakksergal ad5f79a649 More Engineering fixes and adjustments. 2017-08-14 14:58:53 -07: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 0cc22f479c Merge remote-tracking branch 'refs/remotes/origin/master' into map-hotfix 2017-08-14 15:57:27 -04:00
SpadesandGitHub 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
SpadesandGitHub 0353d02ee0 Merge pull request #2009 from VOREStation/map-hotfix
Sec map fixes
2017-08-14 04:16:31 -04:00
SpadesandGitHub cba691a0da Update README.md 2017-08-14 04:07:02 -04:00
Spades 0a808a5cb4 Quick text hotfix 2017-08-14 04:04:51 -04:00
Spades 8e7e4587ac Switched vault door button and air alarm
so the emergency o2 locker isn't blocking it
2017-08-14 03:59:30 -04:00
Spades 8c68b7236c Sec map fixes
- Fixes inverted desk windows.
- Fixes vault door button.
2017-08-14 03:10:20 -04:00
Cyantime 9a6b86cb9b Stop poisoning yourself 2017-08-14 02:22:42 -04:00
Cameron653andGitHub 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
Cameron653andGitHub 0ba9752202 Forgot to change these when I initally copy and pased them. 2017-08-14 01:13:40 -04:00
SpadesandGitHub e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Spades 994f0d38b2 Hotfixes cargo conveyor, again 2017-08-14 00:26:23 -04:00
SpadesandGitHub bfa464e678 Merge pull request #1997 from Cameron653/PAI_SPRITES
Gives PAI modules new fat sprites.
2017-08-13 21:56:47 -04:00
SpadesandGitHub 0d24be30ea Merge pull request #2002 from Yoshax/1234
Fixes Promethean Humans looking really, really bad
2017-08-13 20:55:19 -04:00
SpadesandGitHub 3aab818931 Merge pull request #2003 from Cyantime/mousespawn
Trash piles can now spawn mice
2017-08-13 20:42:38 -04:00
SpadesandGitHub bba56033e2 Merge pull request #2005 from Cyantime/wirefix
Fixes disconnected wire leading to security.
2017-08-13 20:40:16 -04:00
Cyantime 109b1e66e7 Fixes sec multiz wire 2017-08-13 19:34:27 -04:00