Commit Graph
3918 Commits
Author SHA1 Message Date
AnewbeandGitHub 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 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
NeertiandGitHub 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
NeertiandGitHub 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
NeertiandGitHub 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
NeertiandGitHub 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 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
AnewbeandGitHub c0205b1c78 Merge pull request #3953 from Woodratt/WR_09252017_SyndikatID
Syndicate ID changes
2017-09-26 16:03:16 -05:00
NeertiandGitHub 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
NeertiandGitHub 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
NeertiandGitHub 20ea71934c Merge pull request #3919 from Anewbe/tech_shifting
Shifts around a few Tech Levels.
2017-09-24 00:09:02 -04:00
NeertiandGitHub 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
NeertiandGitHub ba8b8d194c Merge pull request #3912 from Anewbe/spider_briefcase
Adds a spider spawner grenade, and variant.
2017-09-24 00:05:26 -04:00
AnewbeandGitHub 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
AnewbeandGitHub 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
AnewbeandGitHub 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
NeertiandGitHub 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
AnewbeandGitHub c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
Belsima cf20b8e3dd Slime scanner sprite. 2017-09-22 14:38:59 -04:00
AnewbeandGitHub 40075a319a Merge pull request #3806 from ghost/woodbuck
Adds wooden buckets, craftable with botany.
2017-09-22 12:20:29 -05:00
Neerti 52c2eaac69 Placates Travis 2017-09-22 01:45:48 -04:00
Neerti afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
Anewbe 0b83e020af Better borg tools, improves Electric Welder 2017-09-20 21:48:15 -05:00
Anewbe 69e9906d75 Adds an endless cable coil to the alien toolbelt 2017-09-20 00:26:41 -05:00
Anewbe da75136b23 Fixes splints for crisis borgs 2017-09-19 21:40:02 -05:00
BelsimaandAnewbe e94e375cd5 Adds nicotine to cigarettes. (#3856)
* Adds nicotine to cigarettes.

* Fixes pathing.

* Adjusts the volume of nicotine added.

* satisfies the lord travis

* Better way of adding nicotine to cigs.
2017-09-18 11:02:51 -05:00
AnewbeandGitHub c9f83a9d68 Merge pull request #3769 from PrismaticGynoid/forgottenlanguages
Brain transplants, synthetics, and languages
2017-09-16 15:35:29 -05:00
AnewbeandGitHub 377e8f15c3 Merge pull request #3838 from Cameron653/master
Removes a comment
2017-09-15 17:52:11 -05:00
Cameron653andGitHub 2207d55e84 owo whats this 2017-09-15 18:43:43 -04:00
Cameron653andGitHub 00d61422d3 H.gloves -> H.shoes 2017-09-12 21:46:56 -04:00
killer653 8b7c0576a5 Fixes legcuffs 2017-09-12 20:47:42 -04:00
Cameron653andGitHub d27e0092da Adds the medical tape item 2017-09-12 14:52:38 -04:00
NeertiandGitHub e7d89af8dd Removes Anti-Bird mechanisms from Defibs
For some reason, small mobs, which include Teshari and Prometheans (and monkeys) cannot use the defib unit.  They can wear the unit but can't actually 'hold' the paddles in both hands, which seems a bit inconsistent and I'd rather just remove the 'no birds allowed' code.
2017-09-11 18:42:18 -04:00
AnewbeandGitHub 605fd11705 Merge pull request #3807 from Cyantime/weldtank
Fixes lit welders not igniting fuel tanks.
2017-09-11 17:23:44 -04:00