Commit Graph

3934 Commits

Author SHA1 Message Date
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci
Science Dufflebag
2017-10-06 10:51:05 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Anewbe
66837464d2 Implanters should have an icon again 2017-10-04 23:07:59 -05:00
Neerti
4db89d42f5 Merge pull request #4014 from Anewbe/drone_permits
Drone permits can now be worn
2017-10-04 20:59:29 -04:00
Anewbe
b393bb897d Repaths permits as accessories 2017-10-03 00:04:58 -05:00
Anewbe
bf6c9ba4b8 Drone permits can now be worn 2017-10-02 23:14:14 -05:00
Anewbe
5e635aff46 Adds a hacky method to put loadout implants in the user's antag records. Fixes a runtime. 2017-10-02 00:11:27 -05:00
Anewbe
46e411f80f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into tracking_implant 2017-10-01 21:52:36 -05: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
b47ac1d76c Merge pull request #3991 from MisterLayne/9/30/17_BetterTRAY
Better T-Ray Scanners
2017-10-01 10:58:35 -05: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
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
969aa45e9a Switches 2 for DEAD 2017-09-29 12:07:16 -05:00
Anewbe
7c5d7c4d75 Improves tracking implant code, adds a tracking implant variant to the loadout 2017-09-28 20:25:46 -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
Neerti
d4dd908f94 Merge pull request #3962 from Anewbe/gravestone
Adds grave markers
2017-09-28 16:22:46 -04: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
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
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
Anewbe
73ddd22296 Implanter tweaks 2017-09-27 11:59:59 -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
c0205b1c78 Merge pull request #3953 from Woodratt/WR_09252017_SyndikatID
Syndicate ID changes
2017-09-26 16:03:16 -05: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
Anewbe
caa4fecd8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer
# Conflicts:
#	icons/obj/abductor.dmi
2017-09-25 20:35:19 -05:00
Neerti
1f9cf5b8f4 Merge pull request #3923 from Anewbe/catwalks_and_railings
Improves catwalks and railings
2017-09-25 21:31:28 -04:00
Woodratt
9f806e2f67 Syndicate ID changes
- Added a Syndicate ID with all access (admin spawn only).
- Port of 'Syndicate id cards now listen for owner destruction' from Bay. Link https://github.com/Baystation12/Baystation12/pull/11563
2017-09-25 17:01:55 -07:00
Anewbe
89716a13d0 The borg shield now protects them from flashes 2017-09-25 03:35:18 -05:00
Anewbe
d0a175994d Adds more channels to intercom msg 2017-09-24 02:00:58 -05:00
Neerti
20ea71934c Merge pull request #3919 from Anewbe/tech_shifting
Shifts around a few Tech Levels.
2017-09-24 00:09:02 -04:00
Neerti
6bd197f5f8 Merge pull request #3895 from Anewbe/interdimensional_cable
Adds an endless cable coil to the alien toolbelt
2017-09-24 00:07:00 -04:00
Neerti
ba8b8d194c Merge pull request #3912 from Anewbe/spider_briefcase
Adds a spider spawner grenade, and variant.
2017-09-24 00:05:26 -04:00
Anewbe
a0ba650609 Merge pull request #3916 from PrismaticGynoid/radioenabledbrains
Makes all synthetic brains radio-enabled.
2017-09-23 20:50:02 -05:00
Anewbe
4b2e4eeca7 Improves catwalks and railings 2017-09-23 20:43:51 -05:00
Anewbe
915264f98b Merge pull request #3821 from Cameron653/LEGCUFF_FUNCTIONALITY
Makes legcuffs work once more.
2017-09-23 17:04:06 -05:00
Anewbe
c57e55d08c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into spider_briefcase
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-09-23 14:40:21 -05:00
Anewbe
b0eeea4a47 Merge pull request #3909 from Belsima/xenobioscanner
Adds a sprite for the slime scanner.
2017-09-23 14:28:08 -05:00
Anewbe
a66072fcf2 Shifts around a few Tech Levels. 2017-09-23 12:54:04 -05:00
PrismaticGynoid
957f742642 Makes all synthetic brains radio-enabled.
Mostly because the old radio-enabled MMIs were almost never used. Changes all MMIs and their subtypes (posi and drone brains) to have a radio inside of them, which can only be used when the brain is outside of a body. This radio can be used to talk over the common channel, in case you get left on a table somewhere by an absent-minded roboticist. However, the radio can also be disabled, in case an antag has you and doesn't want to to scream for help.

Since this makes the old radio-enabled MMIs obsolete, they're no longer printable(although it's still defined in the code so I don't have to touch the map file). Also fixes a telecomms runtime with brains talking over the radio.
2017-09-22 18:49:37 -07:00
Anewbe
b47b1ce1f1 Adds the bone clamp, and some alien surgery tools 2017-09-22 20:45:00 -05:00
Neerti
ad3a4ab6b2 Merge pull request #3899 from Anewbe/surgery_toolspeed
Better borg tools, improves Electric Welder
2017-09-22 19:49:49 -04:00
Anewbe
dd177bc96a Adds a spider spawner grenade, and variant. 2017-09-22 17:23:21 -05:00
Anewbe
c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone
Adds the Lost Drone
2017-09-22 15:24:05 -05:00