cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 23:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,865 Commits 2 Branches 1 Tag
b856613f9a0003a5f77c620e13b00e1817c59c93
Commit Graph

29384 Commits

Author SHA1 Message Date
Nalarac
b856613f9a Replaces Promethean Mouse with Food 
Gives them a protein bar instead
 2019-07-19 18:47:13 -05:00
Atermonera
887804ea10 Merge pull request #6245 from Ketrai/ROCKSDOJUSTROCK 
The great rock update.
 2019-07-13 14:21:19 -08:00
Anewbe
01a7f94781 Merge pull request #6298 from Nalarac/patch-12 
Fixes Plant Produced Stacks
 2019-07-13 14:57:24 -05:00
TheFurryFeline
0cd2b58e94 Nalarac's Farmbot Tweak (#6297) 
* Nalarac's Farmbot Tweak

Adding access_xenobiology to the permission levels for Farmbots so xenobotanists can make use of the bugger. Doing this on behalf of Nalarac, using work from  https://github.com/PolarisSS13/Polaris/pull/6288

* Revert "Nalarac's Farmbot Tweak"

This reverts commit bba618a396.

* Test Comment Addition

* Back on Track

Restores reverted line and re-adds CL. This compiles FINE in everything BUT here. Think it's just Travis being buggy or something.
 2019-07-13 14:56:55 -05:00
Atermonera
f094e43fe1 Merge pull request #6272 from Mechoid/Mining_Expansion_The_Diggening 
Mining Expansion, the Diggening.
 2019-07-12 23:47:42 -08:00
Andrew
90e7228b5d Fixes Plant Produced Stacks 
Tower caps and cloth should stack again. Also, Mechoid is a lazy butt
 2019-07-12 12:09:12 -05:00
Atermonera
1d1a7a3c90 Merge pull request #6294 from Heroman3003/plastic-unflap 
Makes airtight plastic flaps less of a free pass
 2019-07-11 22:51:46 -08:00
Atermonera
63ff55b209 Merge pull request #6293 from Cerebulon/xenoarchtweaks 
Xenoarcheaology Tweaks
 2019-07-11 22:50:30 -08:00
Atermonera
4d043c3cba Merge pull request #6287 from Wickedtemp/master 
Allows Set Transfer Amounts of 250 and 500 for Reagent Cartridges
 2019-07-11 22:49:56 -08:00
Atermonera
23742ce284 Merge pull request #6286 from Mechoid/Glitterpatch 
Patches Glitterflies
 2019-07-11 22:48:36 -08:00
Atermonera
bf6d5f8542 Merge pull request #6282 from Mechoid/TryToFixSlimes 
Try to fix slimes and Prometheans.
 2019-07-11 19:56:53 -08:00
Atermonera
b394451201 Merge pull request #6280 from Nalarac/patch-8 
Fixes Nurse Spider Feeding
 2019-07-11 19:55:23 -08:00
Heroman
a8715d8ed4 Proper way of making it work 2019-07-11 16:42:45 +10:00
Heroman
66ba1a5ccc Makes it work properly with non-mobs 2019-07-11 16:38:15 +10:00
Heroman
24f8780ad2 Makes airtight plastic flaps less of a free pass 2019-07-11 16:23:26 +10:00
Cerebulon
8b4b52acc6 Xenoarcheaology Tweaks 2019-07-11 05:22:34 +01:00
Heroman3003
3eb4c7a531 Fixes endcaps on the specialized pipes (#6283) 2019-07-10 01:52:43 -07:00
Wickedtemp
3306fdf8a5 Update cartridge.dm 2019-07-09 20:56:25 -05:00
Heroman3003
3d46075733 MC camera and access fixes and adjustments (#6269) 
* Adjusts MC camera program, fixes ID program

* Fixes oversight with network access
 2019-07-09 13:00:47 -05:00
Anewbe
49812cad36 Merge pull request #6277 from Mechoid/ActuallyAddTheSeeds 
Actually adds the new seeds to the vendors.
 2019-07-09 12:59:48 -05:00
Mechoid
6c4f0cc32b Patches Glitterflies 2019-07-09 00:23:07 -07:00
Mechoid
009152a3f0 Try to fix slimes. 2019-07-08 19:58:21 -07:00
Andrew
86a1b63307 Actually make handle_corpse do something 
Whoops
 2019-07-08 18:45:08 -05:00
Andrew
deb97d8d8c Merge pull request #1 from Nalarac/patch-9 
Fixes Nurse Spider Feeding
 2019-07-08 18:39:39 -05:00
Andrew
53f0181382 Fixes Nurse Spider Feeding 
Gives nurse spider mauling so they can attack in crit to wrap the mob in webs and handle_corpse so they can wrap dead mobs
 2019-07-08 18:38:22 -05:00
Andrew
c6b040db7b Allows AI to Acknowledge Corpses 
Creates the var "handle_corpse"
 2019-07-08 18:35:47 -05:00
Heroman3003
128549881f Returns logs from plants (#6274) 
* Returns logs from plants

* Returns production of planks from fruit with wood pulp
 2019-07-08 14:32:21 -07:00
Mechoid
92a3d9d20e Actually adds the new seeds to the vendors. 2019-07-07 18:55:41 -07:00
Heroman3003
6d9a5bc168 Fixes ghost riders (#6252) 
* Fixes ghost riders

* Wider usage permissions for bikes
 2019-07-07 16:40:16 -07:00
Anewbe
3e5cea6a71 Merge pull request #6271 from Nalarac/patch-7 
Un-Nerfs Odysseus Tools
 2019-07-07 16:44:21 -05:00
Atermonera
2b0603faaa Merge pull request #6262 from Mechoid/CivilianExpansion1 
Civilian Expansion 1: The Plantening
 2019-07-07 13:29:08 -08:00
Anewbe
ce97daed2e Merge pull request #6242 from Nalarac/patch-4 
Adds Arcane Tech to Cult Items
 2019-07-07 16:17:15 -05:00
Mechoid
16107124ac Update flowercrowns.dm 2019-07-07 13:59:28 -07:00
Mechoid
d8daf4ddc9 Functional Stuff that I didn't push, because I'm an idiot. 2019-07-07 00:18:52 -07:00
Mechoid
b9c6eaa95a Merge branch 'Mining_Expansion_The_Diggening' of https://github.com/Mechoid/Polaris into Mining_Expansion_The_Diggening 2019-07-06 23:27:27 -07:00
Mechoid
2d3845ea05 Update monitor_ward.dm 2019-07-06 22:31:10 -07:00
Mechoid
27408e2adf Update viscerator.dm 2019-07-06 22:30:34 -07:00
Mechoid
4d4b14a2a1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mining_Expansion_The_Diggening 2019-07-06 21:19:03 -07:00
Mechoid
90f8ca9f0d Mining Expansion, the Diggening. 2019-07-06 21:18:31 -07:00
Anewbe
964740cb3b Merge pull request #6270 from Heroman3003/inviscrawl 
Fixes invisible ventcrawlers
 2019-07-06 20:34:25 -05:00
Anewbe
8862c180ba Merge pull request #6267 from Heroman3003/carpetfix 
Fixes carpeted tables refunding wrong carpet type if nonstandard one was used
 2019-07-06 20:33:56 -05:00
Anewbe
7132e2540e Merge pull request #6268 from Heroman3003/targetfix 
Fixes aiming at z-shadows breaking aiming
 2019-07-06 20:33:44 -05:00
Andrew
6e1612da7a Un-Nerfs Odysseus Tools 
This requires staff input

Reverts part of #6170 that makes the mech syringe gun unable to pierce clothing. My opinion is that industrial syringe cannon can pierce clothing.
Partially reverts #2196 that makes it so the sleeper can load someone in 3 seconds instead of 5 (original change was 2 seconds to 5)
 2019-07-05 18:00:21 -05:00
Heroman
2e5d8c6e78 Fixes invisible ventcrawlers 2019-07-06 07:51:09 +10:00
Ketrai
6cc36acccb makes ledges work, kinda. 2019-07-05 17:03:51 +02:00
Mechoid
e5b7e11206 Update Chemistry-Recipes.dm 2019-07-04 13:42:42 -07:00
Atermonera
438e113621 Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2 
Flashes actually work as said on the tin.
 2019-07-03 19:10:07 -08:00
Atermonera
43a96486d3 Merge pull request #6265 from Heroman3003/camerafix 
Fixes technical cameras being affected by random event
 2019-07-03 19:09:15 -08:00
Atermonera
2a7f324393 Merge pull request #6264 from Heroman3003/awood 
Fixes alien wood issues
 2019-07-03 19:08:46 -08:00
Atermonera
1f4b96fab6 Merge pull request #6263 from Nalarac/patch-6 
Nerfs Simple Doors
 2019-07-03 19:07:38 -08:00