Commit Graph

3686 Commits

Author SHA1 Message Date
Cameron653
9cd1919fc6 Reverts vox change I made 2017-02-02 14:35:14 -05:00
Cameron653
82d021eb47 Makes vox tank spawn with nitrogen instead of phoron 2017-02-01 15:59:50 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Arokha Sieyes
d70d85220a Adds hypo for CMO and adds vials in chem for them to use 2017-01-24 01:47:57 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
e23f5c2dd0 Vox airtank fix 2017-01-20 18:04:12 -06:00
Anewbe
f1d37c241d Light boxes should be able to hold 24 bulbs/tubes now 2017-01-19 16:05:31 -06:00
Spades
9b61d10a0a Merge pull request #837 from Cameron653/master
January Polaris Sync and various fixes
2017-01-19 00:39:08 -05:00
Anewbe
81c8570ba8 Merge pull request #2904 from Anewbe/theUnboxingBegins
Returns the Vox, who now breath Phoron
2017-01-17 23:49:14 -05:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe
e63176c2e6 Tweaks some emotes 2017-01-16 18:48:00 -06:00
Arokha Sieyes
e4b6ace4d5 Further language implant fix
It just can't be a child of the other language implant at all.

Fixes #838
2017-01-16 15:33:01 -05:00
killer653
832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Anewbe
0286be65ff Ports Bay's custodial bag tweaks 2017-01-14 23:44:16 -06:00
MagmaRam
e6ac388471 Merge pull request #2891 from Anewbe/cyber_scan
Robolimbs no longer show up on medical's handheld scanners
2017-01-14 14:39:18 -06:00
Arokha Sieyes
6cf76748eb Fix language/EAL implant.
Polaris added an item with the exact same path, hence the weird behavior of the EAL implant teaching you every language. Two items with the same path = weirdness. Should be better now.
2017-01-14 02:32:02 -05:00
Neerti
f393dafa5d Ports Bay's Journalist TV Drone
Also ports prerequisite entertainment radio frequency code.
2017-01-09 05:03:40 -05:00
Anewbe
60df31fc41 Merge pull request #2902 from Neerti/1/2/2017_circuit_permanent_revolution
Permanent Revolution Circuit DLC
2017-01-08 14:42:25 -05:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Anewbe
8ae0c62d60 Merge pull request #2903 from Neerti/1/4/2017_flash_tweak
Make Flashes Great Again
2017-01-05 18:34:29 -05:00
Neerti
42807003f5 Makes halloss amount scale based on flash_strength 2017-01-05 02:30:52 -05:00
Neerti
a31e65782c Make Flashes Great Again
Hand-held flashes now do 30 halloss per flash, if the person lacks flash protection.
Hand-held flashes now can be used 10 times per minute instead of five, due to needing ~4 flashes to down someone.
Flash rounds do 20 halloss if the mob hit lacks flash protection.
2017-01-04 21:45:12 -05:00
Neerti
97ebf0924d Permanent Revolution Update 2017-01-04 04:41:30 -05:00
Anewbe
c9e5cded63 Robolimbs no longer show up on medical's handheld scanners 2017-01-01 23:11:08 -06:00
Anewbe
4ef3cf7ff1 Improves QoL for universal recorders 2016-12-30 21:35:44 -06:00
killer653
064485a0f8 50 sheet stacks fix
The pathfile for fifty sheets is now /obj/fiftyspawner/glass for example

instead of glass/fifty
2016-12-27 08:42:59 -05:00
killer653
9c359cb202 Polaris sync 2016-12-27 08:21:55 -05:00
MagmaRam
190a2bc70c Replaces [stack]/fifty atoms with atoms that spawn the normal stack
The stack/fifty objects were really buggy, this should fix all of that in one go.
2016-12-17 17:27:04 -06:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
MagmaRam
c5b77fcf9e Adds an implant that allows humans to speak EAL.
It's available in the loadout for 2 points.
2016-12-01 22:22:46 -06:00
Anewbe
050aa30eb1 Merge pull request #2817 from MagmaRam/defib_fix_please_make_this_the_last_one_please_god
Defibs should revive people now.
2016-11-24 13:26:03 -06:00
MagmaRam
eef853393e Defibs should revive people now.
This might be an unnecessary fix, I might just have the worst luck.
But I couldn't get a defib to res in 10 tries before this,
got it on the second after.
2016-11-24 00:30:05 -06:00
Anewbe
f6d311093a Merge pull request #2807 from MagmaRam/door_tape
Tape can't be put on doors infinitely.
2016-11-22 21:57:11 -06:00
MagmaRam
14a68d6dcd Tape can't be put on doors infinitely. 2016-11-22 21:36:05 -06:00
Anewbe
07b5b6fc1c Defibs should actually work now 2016-11-21 19:18:05 -06:00
Techhead
e679590204 Allows breaking tape with any object.
The previous system was arbitrary, considering you can use your bare hands.
Resolves #14642
2016-11-21 00:07:35 +00:00
Yoshax
55c0fc86a3 Fixes up and implements the experimental welding tool 2016-11-20 18:59:06 +00:00
MagmaRam
20b6d4be57 Merge pull request #2718 from Anewbe/teargas
Adds teargas grenades, currently aspawn only
2016-11-15 20:05:35 -06:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing
Ports sign language
2016-11-14 14:51:48 -06:00
Anewbe
8e5f9444f7 Fixes the autopsy scanner bugging on print 2016-11-14 14:14:25 -06:00
Arokha Sieyes
6022963815 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into defib
# Conflicts:
#	icons/obj/device.dmi
2016-11-12 14:55:16 -05:00
Anewbe
62c973f631 Merge pull request #2729 from Yoshax/uplinks
Resolves mercs not spawning with an uplink
2016-11-12 13:40:41 -06:00
Yoshax
418ea1b0ba Resolves mercs not spawning with an uplink 2016-11-12 18:13:45 +00:00
Anewbe
3a33b6221d More thing fixes 2016-11-12 12:01:44 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Arokha Sieyes
f3b155b6f3 Switch << to 'to_chat' 2016-11-12 10:35:02 -05:00
Arokha Sieyes
2ea72d692f Drag to apply, reduced to 2 charges
More balanced maybe? More like 'rounding problems' dividing 1000 by 3 and having it work right.
2016-11-11 22:59:31 -05:00
Anewbe
d453a8dc5b Fixes the Sign over Radio bug 2016-11-11 19:58:46 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00