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
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
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
Neerti
ab76e6d612
Merge pull request #3958 from Anewbe/legcuffs
...
Changes Legcuff sprites
2017-09-27 19:05:32 -04:00
Neerti
135c5b9219
Merge pull request #3950 from Anewbe/radiation_glows
...
Radiation-Mob Interaction tweaks
2017-09-27 19:05:09 -04:00
Anewbe
424ca30006
Merge pull request #3960 from MisterLayne/9/26/2017_Synthetic_Syring_Fix
...
Synth Syringe Fix
2017-09-27 17:42:43 -05:00
MisterLayne
c967d4cf6e
Fixes cables on FBPs (and probably cyborgs)
2017-09-27 15:56:25 -04:00
Anewbe
eed312a8fb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone
...
# Conflicts:
# icons/obj/structures.dmi
2017-09-27 13:49:56 -05:00
elgeonmb
2df750f869
ur right prismatic
2017-09-27 11:23:30 -07:00
Anewbe
7aa1d4fcef
Tweaks the Chameleon Gun's tech levels
2017-09-27 12:25:36 -05:00
elgeonmb
a17d83fb80
Drone circuit +posibrain lorechanges
...
Removes all that mumbo about "you live to serve" and replaces it with a reminder that you're designed to be friendly to human values. I don't really see the trouble with this-- if a new drone or posi wants to be a surly bastard, it can, it's just not getting sleeved in a shiny bipedal body.
Also adds a bunch of indulgent OS names for drone circuits.
(Realtalk this is mostly just me figuring out how PRs work so I can start being something closer to actually productive)
2017-09-27 02:09:06 -07:00
Anewbe
dcf4a6bfea
Adds give-modifier to the debug verb list
2017-09-27 01:16:04 -05:00
Anewbe
47f2854bb7
Makes the scythe a child of fireaxes, adds it to the weed control crate
2017-09-26 22:15:33 -05:00
Anewbe
280f3010f8
Adds grave markers
2017-09-26 21:03:34 -05:00
Anewbe
670ae66772
Merge pull request #3956 from Neerti/9/26/2017_old_farmer_harrison
...
Adds Farm PoI
2017-09-26 19:12:35 -05:00
Anewbe
215c080b1e
Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines
...
Adds Recently Cloned Modifier to Cloners
2017-09-26 19:09:12 -05:00
Anewbe
267f5299d9
Merge pull request #3932 from Cameron653/patch-4
...
Allows resting people to get off the ground w/ assistance.
2017-09-26 17:48:15 -05:00
MisterLayne
dde6d7d00a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/26/2017_Synthetic_Syring_Fix
2017-09-26 17:30:30 -04:00
MisterLayne
99d68540bc
Fixes Glitched Synthetic Syring
2017-09-26 17:12:47 -04:00
Anewbe
c0205b1c78
Merge pull request #3953 from Woodratt/WR_09252017_SyndikatID
...
Syndicate ID changes
2017-09-26 16:03:16 -05:00
Anewbe
b6534b9008
Merge pull request #3949 from Atermonera/AI_langs
...
AI can speak station languages
2017-09-26 15:05:58 -05:00
Neerti
dcd2580dc2
Merge pull request #3918 from Anewbe/liver_alcohol
...
Adjusts liver damage from alcohol
2017-09-26 07:01:15 -04:00
Neerti
447ad5de70
Merge pull request #3927 from Anewbe/intercom
...
Adds more channels to intercom msg
2017-09-26 07:00:40 -04:00
Anewbe
a4dd5056b0
Changes Legcuff sprites
2017-09-26 05:48:59 -05:00