Commit Graph

7360 Commits

Author SHA1 Message Date
Arokha Sieyes
e60eb8464e Additional mining tweaks on zone handling
Keep 2 zones clean instead of 1
Give 10 points for free, for progressing zones
Always score zones unless already scored, if asked to
Space geese are SPACE geese
2017-02-15 15:55:39 -05:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Spades
b6cfefaea4 Merge pull request #936 from VOREStation/runtime
Runtime eats mice
2017-02-09 21:25:24 -05:00
Arokha Sieyes
b307d9a90e Runtime eats mice
Fixes #417
2017-02-08 16:37:50 -05:00
Arokha Sieyes
95a41466c7 Merge pull request #932 from VOREStation/humancolor
Gives humans a default color
2017-02-08 16:23:21 -05:00
Arokha Sieyes
cf0262b9bf Gives humans a default color
Fixes #404
2017-02-08 14:49:51 -05:00
Screemonster
4d81b0b74b Adjusts CE_SPEEDBOOST to not just return -3 2017-02-06 20:56:19 -05:00
Screemonster
cdc4e6e0f8 Adjusts CE_SPEEDBOOST to not just return -3 2017-02-07 00:48:43 +00:00
Arokha Sieyes
f7dec11bd9 Merge pull request #917 from VOREStation/promdirt
Remove promethean dirt eating
2017-02-06 16:05:12 -05:00
Arokha Sieyes
cadd04965a Remove promethean dirt eating
Too crazy with our uncapped nutrition values and ingame effects of being thicc. Taking 10 steps will make them fat.
2017-02-05 03:10:37 -05:00
Spades
363a2e602e Merge pull request #904 from Cameron653/master
Organizes prometheans and bugfix
2017-02-05 01:36:08 -05:00
Arokha Sieyes
98d2468127 Merge pull request #913 from VOREStation/fix-stupid-punpun
Fix the annoying punpun runtime thrown on map load.
2017-02-04 22:52:02 -05:00
Leshana
0e912c6097 Add comments demarking the custom edit. 2017-02-04 22:43:36 -05:00
Cameron653
8146a3e3eb Update station_vr.dm 2017-02-04 21:11:44 -05:00
Cameron653
011590aea6 Update prometheans_vr.dm 2017-02-04 21:11:21 -05:00
Leshana
457f5b3030 Fix the annoying punpun runtime thrown on map load. 2017-02-04 20:43:04 -05:00
Arokha Sieyes
3102d81e10 Fixes omnihud glasses
Code accidentally removed.
Fixes #905
2017-02-03 21:10:17 -05:00
Cameron653
b7f5b7789c Update prometheans_vr.dm 2017-02-03 20:06:24 -05:00
Cameron653
8ba417b863 Update station_vr.dm 2017-02-03 20:05:36 -05:00
Cameron653
57fbde6ab0 Gives xenochimera a "sonar ping" 2017-02-02 14:39:17 -05:00
Cameron653
e5f5a2e881 Removes edit I made to make vox breath nitrogen 2017-02-02 14:34:28 -05:00
Anewbe
587044275c Merge pull request #2975 from Anewbe/spider_nerf
Spiders inject fewer spiderlings
2017-02-01 21:58:26 -06:00
Cameron653
19c65d5bdd Makes vox breath nitrogen and makes phoron poison to them
This allows vox to walk around the station without keeling over and dying due to the oxygen, as nitrogen in the air.
Additionally, this makes it so instead of breathing phoron, phoron is a poison to them
2017-02-01 15:58:06 -05:00
Cameron653
2c765e91ee Whitelists vox 2017-02-01 15:47:57 -05:00
killer653
7d9d970a2e For some reason this didn't get pushed 2017-02-01 15:11:06 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
fd1ade9982 Spiders inject fewer spiderlings 2017-01-31 21:57:39 -06:00
Neerti
088ebc328e Fixes Borg Typing Indicator
Borgs that are typing will no longer lose the indicator a second later.
2017-01-31 16:28:41 -05:00
Arokha Sieyes
b17e1d86ea Makes stasis bags put people to sleep
They don't, right now. It's a little weird. People are just magically cured of their pain and can talk normally, forever, as long as they are in a stasis bag. No hunger/drug effects/bleeding/organ damage progression/toxin damage/oxygen damage, etc. AAAnd can talk normally while in "stasis"? Bags op pls nerf.
2017-01-30 12:14:07 -05:00
Anewbe
62d19de99f Merge pull request #2929 from Anewbe/taste
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
f924f5ef05 Diona can regrow limbs 2017-01-27 23:47:44 -06:00
Anewbe
a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Anewbe
09ce761931 Adds Medical and Meson Aviators 2017-01-26 22:25:37 -06:00
Anewbe
6816af4485 More toys kikiki 2017-01-25 22:20:52 -06:00
Yoshax
8a5b09c539 Fixes slipping + lube 2017-01-25 20:33:11 +00:00
Spades
20b9ac6f57 Merge pull request #854 from Screemonster/moreferaltweaks
More xenochimera tweaks
2017-01-23 21:39:45 -05:00
killer653
e090d45e35 Github client didn't save this. 2017-01-22 10:47:53 -05:00
Cameron653
5d2fa0db2c Fixes #857, adds sanity check to dogborgs
Fixes #857
2017-01-22 10:22:08 -05:00
Anewbe
3be442e766 Merge pull request #2947 from Anewbe/surgery_things
Surgical tools will no longer cause damage on help intent
2017-01-21 22:38:25 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
a0343133dd Merge pull request #2941 from Mechoid/Multi-SpriteSet
Allows individuals to have multiple custom Borg Sprite-Sets.
2017-01-21 19:23:36 -05:00
Screemonster
fc6bf4f128 fucked up my maths 2017-01-21 21:36:51 +00:00
Screemonster
64c80a8fdf movement, logging, tweaks 2017-01-21 21:17:30 +00:00
Anewbe
e23f5c2dd0 Vox airtank fix 2017-01-20 18:04:12 -06:00
Screemonster
9846a23fd2 Feral critters can't into firearms 2017-01-20 04:09:46 +00:00
Anewbe
27ea27964e Adds and tweaks Vox toys 2017-01-19 21:28:51 -06:00
Anewbe
86077f6c1a Broken bones work differently 2017-01-19 15:32:58 -06:00
Mechoid
1363fb49c3 Allows individuals to have multiple custom borg sprite-sets without using multiple ckeys.
Small modification of robot.dm to make both custom sprite set-ings compliant with one-another.
2017-01-19 01:35:33 -08:00
Spades
edd6d713c9 Merge pull request #822 from BothNevarBackwards/attkChoose
Allows Human Type Mobs to Select a Primary Attack
2017-01-19 00:39:34 -05:00
Anewbe
9a451c826e Human mobs spawn in with a random amount of nutrition 2017-01-17 23:07:17 -06:00