Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
81aec38408
Fixes a text thing
2017-03-31 19:40:40 -05:00
Anewbe
ca47d37d2f
Adds a few more cosmetic flashlights
2017-03-31 18:50:00 -05:00
MagmaRam
34e398d328
Merge pull request #3175 from Anewbe/hands_things
...
Device Cell QOL
2017-03-30 20:49:24 -05:00
MagmaRam
19a9a8a413
Merge pull request #3172 from Anewbe/jumper_cables
...
Adds in Jumper Cables for FBP reviving
2017-03-30 19:46:26 -05:00
Anewbe
c9bfabd426
Device Cell QOL
2017-03-29 13:58:35 -05:00
Anewbe
6328f1262f
Adds in Jumper Cables for FBP reviving
2017-03-29 12:43:38 -05:00
Cerebulon
1d09caa08d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites
2017-03-29 06:24:06 +01:00
Cerebulon
55fd0a2041
Adds hand sprites to many items in the engineering department
2017-03-29 04:09:33 +01:00
Anewbe
cddbc6e976
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs
2017-03-28 14:28:15 -05:00
Arokha Sieyes
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04:00
Cerebulon
6472f02040
Removed unnecessary icon_state code. Added basic scanner sprite.
2017-03-26 22:00:09 +01:00
Cerebulon
3c17d1b33f
Added in-hand sprites to most item lacking them from the Medical department.
...
(Full list: Body bag, Advanced Mass Spectrometer, Rescue Suit Control Module, Stethoscope, Stasis bag, Defibrillator, Blood Packs, Advanced Trauma/Burn Kits, Hypospray, Biopsy Scanner, Surgical Drill, Fixovein, Retractor, Bone-Gel, Bone Setter, Cautery, Hemostat, Inflatable Wall Box.
2017-03-26 07:04:01 +01:00
Anewbe
88b0c6086e
Antag Radio changes
2017-03-25 14:19:57 -05:00
Cerebulon
38571fb8bc
Adds in-hand sprites to several items.
...
Hand labeller, light replacer, megaphone, binoculars, powersink, suit cooler and lantern.
2017-03-23 22:03:17 +00:00
MagmaRam
e3a87c1c78
Merge pull request #2985 from Anewbe/more_pdas
...
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
Arokha Sieyes
be9bcf81f0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-03-21 11:22:29 -04:00
Anewbe
c65588b099
Communicator QoL
2017-03-21 00:51:26 -05:00
Arokha Sieyes
805b473976
Polaris Sync Merge
...
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Anewbe
bf307ac0dc
Translators can't output hive or nonverbal languages
2017-03-15 20:56:18 -05:00
Neerti
d4b6fc9f32
Merge pull request #3052 from Anewbe/emp_things
...
Reworks empulse and emp_act
2017-03-14 21:39:01 -04:00
Anewbe
ab1812d9ff
Adds the ear translator
2017-03-13 20:03:45 -05:00
Arokha Sieyes
4c0e330140
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync
2017-03-11 18:47:17 -05:00
Anewbe
f4dd443b01
Ports the translator
2017-03-10 21:46:57 -06:00
Anewbe
7130d56b80
Merge pull request #3064 from Woodratt/WR_SC_Changes
...
WR_SC_Map_Changes
2017-03-08 19:58:46 -06:00
woodratt
19fb047f01
WR_SC_Map_Changes
...
- Fixes sprite issues with departmental intercoms.
- Tweaks to the random objects dm
- Copies Bay's flora and warning sign list, as well as ports some of their signs.
- Addition of a couple new floor decals.
- New table preset, wooden reinforced.
2017-03-08 17:44:48 -08:00
Leshana
f53dfde515
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06
...
# Conflicts:
# code/game/objects/items/blueprints.dm
# vorestation.dme
2017-03-06 20:58:38 -05:00
Anewbe
b4ec8eb026
Oxyloss shows as cyan
2017-03-05 14:19:51 -06:00
Anewbe
19710d9bd8
Reworks empulse and emp_act
2017-03-05 12:22:45 -06:00
Yoshax
3162c723d9
Security non-lethal balance
2017-02-13 15:49:35 +00:00
Anewbe
79390b6177
Adds rugged style PDAs
2017-02-04 22:42:06 -06:00
killer653
832418c7c9
Polaris sync
2017-01-15 18:12:15 -05: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
Neerti
f393dafa5d
Ports Bay's Journalist TV Drone
...
Also ports prerequisite entertainment radio frequency code.
2017-01-09 05:03:40 -05: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
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
0c73b9da2e
Polaris December Sync
2016-12-10 09:51:11 -05: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
07b5b6fc1c
Defibs should actually work now
2016-11-21 19:18:05 -06:00
MagmaRam
ac81408cf9
Merge pull request #2724 from Anewbe/signing
...
Ports sign language
2016-11-14 14:51:48 -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
