Commit Graph

26176 Commits

Author SHA1 Message Date
Neerti
16f6e21e17 Merge pull request #3964 from Anewbe/cloning_sickness
Renames the cloning modifier, minor grammatical fixes
2017-10-01 14:48:11 -04:00
Anewbe
e82ea2d599 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix
# Conflicts:
#	icons/obj/items.dmi
2017-10-01 13:13:13 -05:00
Anewbe
5d819ade53 Fixes the entire cloning_sickness PR 2017-10-01 12:50:06 -05:00
Neerti
23b0312af9 Merge pull request #3975 from Anewbe/no_clone
Adds a no_clone modifier
2017-10-01 13:29:25 -04:00
Neerti
4a0ef92303 Merge pull request #3985 from Anewbe/crabs
Adds giant crabs
2017-10-01 13:28:30 -04:00
Anewbe
b47ac1d76c Merge pull request #3991 from MisterLayne/9/30/17_BetterTRAY
Better T-Ray Scanners
2017-10-01 10:58:35 -05:00
Anewbe
5828e126fe Merge pull request #3995 from Cameron653/patch-5
Removes second definition of katana
2017-10-01 10:43:03 -05:00
Neerti
bc6f98c23a Merge pull request #3987 from Anewbe/frost_spider_poi
Adds a frost spider nest PoI, adds frost spider things
2017-10-01 01:26:55 -04:00
Anewbe
ab0c05bdf7 Merge pull request #3988 from Mechoid/Mecha_2_The_Mechening_V_1
Brain-Mech fix, MMI Runtime fix, Mecha Wall Punching Fix
2017-09-30 21:44:59 -05:00
Anewbe
03abb61e2e Merge pull request #3989 from Neerti/9/30/2017_shield_tweaks
Directional Shield Tweaks
2017-09-30 21:43:27 -05:00
Neerti
459fbbdc2a Merge pull request #3952 from Anewbe/slimejelly
Makes it possible to get slimejelly
2017-09-30 17:47:27 -04:00
Cameron653
9b7ed4fbcc Katana was defined twice 2017-09-30 17:35:11 -04:00
MisterLayne
568c9554ed Adds better Tscanners. 2017-09-30 10:59:38 -04:00
Mechoid
77f0e7514c Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's. 2017-09-29 22:10:48 -07:00
Neerti
42fe0c1f9f Directional Shield Tweaks
Shields now give a visual indicator of health by shifting towards a red color as the health gets closer to zero.
AI turrets will no longer give up in despair and not even try to kill people hiding in shields.
Adds weaker variant of the shield projector, with smaller radius and health more suited to one on one engagement verses the base shield being tuned for teamfighting.
2017-09-30 00:25:49 -04:00
Mechoid
058aae2983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mecha_2_The_Mechening_V_1 2017-09-29 20:32:23 -07:00
Mechoid
b4a323ec38 Fixes Brain-Mechs, and a tangentially related MMI runtime. 2017-09-29 20:29:30 -07:00
Anewbe
b3fdf3836e Adds a frost spider nest PoI, adds frost spider things 2017-09-29 22:01:41 -05:00
Anewbe
eada60d41f Adds giant crabs 2017-09-29 19:54:27 -05:00
Neerti
34f5b7b6bf Merge pull request #3970 from Anewbe/vox_scrap
Ports Bay's Vox Scrap armor, moves some clothing files
2017-09-29 18:40:59 -04:00
Neerti
b31df8b4ae Merge pull request #3978 from Cyantime/pipemeter
Pipe meter tweaks
2017-09-29 17:28:10 -04:00
Neerti
d7a6c93b23 Merge pull request #3972 from Anewbe/temperate_sif
Adjusts the values of Sif's weather.
2017-09-29 17:26:59 -04:00
Anewbe
a5acb5d1bb Merge pull request #3971 from Neerti/9/28/2017_stack_asthetics
Adds differing stack sprites
2017-09-29 16:07:04 -05:00
Anewbe
22c91faa86 Merge pull request #3976 from MisterLayne/9/28/17_DeactivateGuestPass
Makes guest passes great again!
2017-09-29 16:01:11 -05:00
Anewbe
08b872343b Merge pull request #3974 from Neerti/9/27/2017_more_shields
Adds Directional Shields
2017-09-29 15:56:08 -05:00
Neerti
4c2fd72c5f Merge pull request #3977 from Cyantime/trinary
Fixes some trinary device direction initializations
2017-09-29 15:45:59 -04:00
Neerti
cdb2a85538 Merge pull request #3963 from Anewbe/scythe
Makes the scythe a child of fireaxes, adds it to the weed control crate
2017-09-29 09:53:18 -04:00
Anewbe
3e18ec7a47 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vox_scrap
# Conflicts:
#	icons/obj/clothing/suits.dmi
2017-09-28 20:55:37 -05:00
MisterLayne
c47cc200d5 Makes guest passes great again! 2017-09-28 19:43:57 -04:00
Cyantime
4ba5c28eca Pipe meter examine update. 2017-09-28 19:29:56 -04:00
Cyantime
b118476da8 Pipe meter tweaks 2017-09-28 19:25:35 -04:00
Cyantime
56afe20d39 Fixes some trinary device direction initializations 2017-09-28 17:39:46 -04:00
Anewbe
9f651ba5f2 Adds a no_clone modifier 2017-09-28 16:26:24 -05:00
Anewbe
dffb3a6fef Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scythe
# Conflicts:
#	icons/obj/weapons.dmi
2017-09-28 16:07:45 -05:00
Anewbe
ef1749009a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into implanter_fix
# Conflicts:
#	icons/obj/items.dmi
2017-09-28 15:56:53 -05:00
Anewbe
a030390c4e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into drone_circuits
# Conflicts:
#	code/modules/mob/living/carbon/brain/MMI.dm
2017-09-28 15:38:19 -05:00
Neerti
ea138e0cec Merge pull request #3968 from Anewbe/cham_gun
Tweaks the Chameleon Gun's tech levels
2017-09-28 16:25:02 -04:00
Neerti
d4dd908f94 Merge pull request #3962 from Anewbe/gravestone
Adds grave markers
2017-09-28 16:22:46 -04:00
Neerti
5cd490f7b2 Merge pull request #3940 from Anewbe/technomancer_armor
Improves the tesla and shield generator armors
2017-09-28 16:22:18 -04:00
Neerti
0ad7eee12a Adds automatic shield projector for simple animals 2017-09-28 15:05:14 -04:00
Neerti
fe32372f74 Adds Directional Shields
Implements shields which block projectiles from outside, but allow projectiles to leave from inside.
Also adds a projector item which makes these, in two variants, rectangle and line.  It was made an item so that down the road making stationary/wearable/etc versions will be easier as they can just contain the item.
Currently there is no way to obtain this without adminspawn.  I have Future Plans(tm) for these.
2017-09-28 14:06:07 -04:00
Anewbe
6559299591 Merge pull request #3966 from elgeonmb/elgeonmb-brainlore
Drone circuit + posibrain lorechanges
2017-09-28 11:09:35 -05:00
Anewbe
d3f3e48897 Adjusts the values of Sif's weather. 2017-09-28 00:08:37 -05:00
Neerti
d2b3e7344c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_stack_asthetics 2017-09-28 01:06:04 -04:00
Neerti
2f173dd16b Adds differing stack sprites
Ports most of /tg/'s sprites for stacks displaying their contents.  I added some of my own as well to fill in materials that we have but they didn't.
Moves all stack icons to their own dmi.
Reworks fifty_spawners to use paths instead of strings, as it prevents bugs in the long term.
2017-09-28 01:04:19 -04:00
Anewbe
a3534ab339 Ports Bay's Vox Scrap armor, moves some clothing files 2017-09-27 20:11:37 -05:00
Anewbe
1217c1d23c Merge pull request #3961 from MisterLayne/9/26/2017_CableSurgeryFix
Fixes cables on FBPs (and probably cyborgs)
2017-09-27 19:46:29 -05:00
Anewbe
7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00
Neerti
853d8e80f1 Merge pull request #3914 from Anewbe/bone_fixer
Adds the bone clamp, and some alien surgery tools
2017-09-27 19:06:32 -04:00
Neerti
e0d450c5ea Merge pull request #3948 from Anewbe/flash_shield
The borg shield now protects them from flashes
2017-09-27 19:05:58 -04:00