Commit Graph

19099 Commits

Author SHA1 Message Date
Atermonera
a11504f5f2 Merge pull request #6068 from Mechoid/WhatWasWillBe
Re-adds the Space Worm.
2019-04-26 15:32:46 -08:00
Atermonera
e61d850435 Merge pull request #6058 from Neerti/permastuns_are_bad
Removes umbrella permastuns. Adds wind mechanics.
2019-04-26 15:31:56 -08:00
Neerti
e566f4d03f Merge pull request #6131 from Heroman3003/nurse-two
Fixes a typo in nurse spider ai code
2019-04-25 17:01:43 -04:00
Heroman
422b0da409 Fixes cartridges having same design ID 2019-04-26 06:04:33 +10:00
Heroman
98bf80e7b3 Fixes names of some cartridges, order of designs 2019-04-26 05:44:11 +10:00
Heroman
5a5e8d133b Minor PDA cartridge tweaks 2019-04-26 05:39:43 +10:00
Heroman3003
535349dcce Fixes ai priority targeting 2019-04-25 10:21:44 +10:00
Heroman3003
48b852e5e9 Merge branch 'master' into mask-helmet-eating 2019-04-25 07:34:07 +10:00
Anewbe
cd4fb67058 Merge pull request #6126 from Heroman3003/phoronguard
Fixes some items having item_flag PHORONGUARD
2019-04-24 16:12:03 -05:00
Atermonera
3f3f449543 Merge pull request #6128 from Mechoid/SlimesAreAssholes
Xenobio Slimes Grudge Promethean Attackers
2019-04-24 11:29:30 -08:00
Heroman
708518e1f3 Fixes a typo in nurse spider ai code 2019-04-24 15:53:05 +10:00
Unknown
539f4f133a Removes Space Magazine
Only commented out, so that it can be used as an example for future lore projects.
2019-04-23 14:01:22 -04:00
Mechoid
c35eedefe7 Wormholes. 2019-04-22 23:33:54 -07:00
Unknown
d4c0dd5d69 Merge remote-tracking branch 'PolarisSS13/master' into spriteadd 2019-04-22 20:20:56 -04:00
Atermonera
93abdb04ea Merge pull request #6123 from Mechoid/OneDayIllBeAGoodDev
Marble ore [Exists] again.
2019-04-22 10:29:20 -08:00
Mechoid
c4665ae0a4 & 2019-04-21 22:24:51 -07:00
Neerti
47e8b110b4 Merge pull request #6115 from Mechoid/SterilizineTheThinkingXenobiologistsWeapon
Sterilizine Hurts Slimes
2019-04-22 01:24:19 -04:00
Neerti
d6a74b637e Merge pull request #6116 from Mechoid/WhyAmIStupid
God damnit past me.
2019-04-22 00:26:58 -04:00
Neerti
42bd6eb1c2 Merge pull request #6105 from Heroman3003/climbybois
Fixes borgs being unable to use ladders
2019-04-22 00:26:44 -04:00
Heroman3003
1f24765d1d Allows liquidfoods to be eaten through protective gear 2019-04-22 10:31:07 +10:00
Mechoid
29c5ee05e3 Xenobio slimes now get grudges against Prometheans that attack them, making them valid targets for that slime as long as it lives. 2019-04-21 16:06:17 -07:00
Heroman
d39a6c722f Fixes some items having item_flag PHORONGUARD 2019-04-21 18:21:19 +10:00
Neerti
546e4ccc7d Adds Config-Controlled Automated Solar Setup (#6107)
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
2019-04-21 00:33:38 -07:00
Mechoid
156d3c0d2c One day. 2019-04-20 15:35:51 -07:00
Mechoid
234af8bc9e Multi-Tile movement, and a shuttle mechanized vehicle to use it. 2019-04-20 00:33:04 -07:00
Heroman
f41f9aef98 Fixes nurse spiders getting stuck in infinite loop 2019-04-20 11:38:02 +10:00
Mechoid
a5136b02e2 God damnit past me. 2019-04-18 19:45:29 -07:00
Mechoid
1f9fe948c4 Sterilizine Hurts Slimes 2019-04-18 18:51:23 -07:00
Heroman
1ed8d06a92 Fixes copypaste mistake in robot climbing 2019-04-19 06:07:13 +10:00
Atermonera
57d7a9672a Merge pull request #6099 from Heroman3003/fcookie-runtime-fix
Fixes fortune cookie recipe runtime
2019-04-18 09:26:59 -08:00
Atermonera
2af21a1911 Merge pull request #6096 from Heroman3003/syringe-beaker-interactions
Changes way syringes interact with containers
2019-04-18 09:26:34 -08:00
Atermonera
cbcd41ebf4 Merge pull request #6090 from Mechoid/Hopefully_Fixes_Ghost_Checks
Hopefully fixes ghost presence checks.
2019-04-18 09:22:11 -08:00
Atermonera
bc2dc3f2ad Merge pull request #6097 from Heroman3003/mice-for-goo
Fixes promethean mice lunchboxes
2019-04-18 09:21:18 -08:00
Atermonera
8d57dec81d Merge pull request #6103 from Heroman3003/convinienct-suiting
Allows voidsuits to be modified in hands
2019-04-18 09:10:16 -08:00
Atermonera
3661d6ffc7 Merge pull request #6081 from Mechoid/PulseBasedReagentProcessing
Starts work on Organs affecting Reagent Processing
2019-04-18 09:08:43 -08:00
Mechoid
131f51dac8 G L O B 2019-04-18 02:39:56 -07:00
Mechoid
5e853f59ac Merge branch 'master' of https://github.com/PolarisSS13/Polaris into FishingFtWorldServer 2019-04-17 23:42:02 -07:00
Mechoid
e1876dcd02 Fishing and all its wonders, Ft. World Server code bastardization. 2019-04-17 23:41:03 -07:00
Mechoid
13db58a51c Adds Robobags (#6059)
* Adds Robobags

* Finishes robobags

* FixFix
2019-04-17 21:39:36 -08:00
Atermonera
24b2df4b9b Merge pull request #6026 from Mechoid/Precursotech_Janus
Precursotech Janus
2019-04-17 20:32:14 -08:00
Layla Crosse/Occula Drenn
b9af45b2da Research QoL changes (#6042)
* Research QoL changes

* Reverts changes relating to blanket print times and Protolathe storage

* Actually changes the design print time.

Why do you hate me github.

* Fixes an enter key error caused by the editor.

* Actually does all of the things I needed to do like a smart person

Which apparently I am not.

* Fixes a newline

Because goddamn it the online editor hates me too.
2019-04-17 01:50:36 -07:00
Neerti
ed13e9d748 Merge pull request #6095 from Heroman3003/unduping-synths
Fixes synthesisers inserting more materials than they had
2019-04-17 02:36:04 -04:00
Heroman3003
8a14c0eaf9 Fixes borgs being unable to use ladders 2019-04-17 13:04:36 +10:00
Neerti
3bb550dcca Merge pull request #6093 from Heroman3003/zpipe-fix
Fixes newly constructed vertical pipes being invisible
2019-04-16 22:00:09 -04:00
Heroman3003
8ea3a0f589 Allows voidsuits to be modified in hands 2019-04-17 11:46:06 +10:00
Heroman3003
8b34e47a84 Fixes fortune cookie recipe runtime 2019-04-17 09:26:18 +10:00
Heroman3003
f2a0c05f69 Fixes promethean mice lunchboxes 2019-04-17 07:58:36 +10:00
Heroman
2cb39322d1 Changes way syringes interact with containers 2019-04-16 17:10:56 +10:00
Heroman
d9207cc7f8 Fixes synthesisers inserting more materials than they had 2019-04-16 15:01:16 +10:00
Heroman3003
a5968047f6 Fixes newly constructed vertical pipes being invisible 2019-04-16 11:58:49 +10:00