Commit Graph

3704 Commits

Author SHA1 Message Date
Atermonera
971cd2da30 Translators don't understand animals and other languages that recorders can't record. 2017-04-01 16:48:01 -07:00
MagmaRam
4000be7ec5 Merge pull request #3191 from Anewbe/flashlight_options
Adds a few more cosmetic flashlights
2017-03-31 20:07:42 -05: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
Anewbe
72adee8fb8 Adds a bunch of things to cargo 2017-03-31 00:23:27 -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
MagmaRam
850155bfb7 Merge pull request #3167 from Anewbe/cigarette_sprites
Cigarettes and cigars have a "Burnt but not done" sprite
2017-03-30 19:37:27 -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
f91431fefa Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cigarette_sprites 2017-03-28 20:36:48 -05:00
Anewbe
826b7c5af0 Fixes a thing 2017-03-28 20:17:35 -05:00
MagmaRam
2f976a22f8 Merge pull request #3158 from Anewbe/fbp_screams
FBPs should no longer scream when they collapse
2017-03-28 20:03:01 -05:00
MagmaRam
9ff0180315 Merge pull request #3138 from Anewbe/radio_freqs
Antag Radio changes
2017-03-28 20:02:44 -05:00
MagmaRam
33dffeb0b8 Merge pull request #2955 from Anewbe/heart_damage
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
MagmaRam
c7e224b6e2 Merge pull request #3075 from Anewbe/armor_soak
Implements Armor Soak
2017-03-28 20:02:00 -05:00
MagmaRam
6a2d0826cb Merge pull request #3126 from Anewbe/box_cutter
Adds Boxcutters
2017-03-28 19:59:09 -05:00
Anewbe
cddbc6e976 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radio_freqs 2017-03-28 14:28:15 -05:00
Anewbe
7e279ebd03 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into electric_welder
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-03-28 00:17:28 -05:00
Anewbe
77886b648c Fixes a travis issue 2017-03-27 23:22:36 -05:00
Anewbe
d66e1beca0 Adds the electric welder 2017-03-27 22:43:20 -05:00
Anewbe
73ab115295 Fixes a thing. 2017-03-27 22:32:02 -05:00
Schnayy
e4ca4707d1 Fixed code at Neerti's request, fixed a small sprite error where crowns appeared in the wrong hand. 2017-03-27 21:24:47 -05:00
Schnayy
0f98eedab4 Fixed indentation 2017-03-27 17:16:06 -05:00
Schnayy
971eb97399 Fixed conflict? Maybe? Please? 2017-03-27 00:42:39 -05:00
Anewbe
431dd1d290 Adds taking drags from smokables 2017-03-26 18:07:35 -05: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
Anewbe
3816d634ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into armor_soak
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
2017-03-24 16:35:31 -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
Anewbe
a80ea977d1 Adds Boxcutters 2017-03-23 15:27:48 -05:00
MagmaRam
e3a87c1c78 Merge pull request #2985 from Anewbe/more_pdas
Adds rugged style PDAs
2017-03-22 19:42:19 -05:00
Anewbe
2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
Anewbe
538f91c202 Borg stun arm should work now. 2017-03-22 17:06:16 -05:00
Anewbe
c65588b099 Communicator QoL 2017-03-21 00:51:26 -05:00
nachomeep
83cc019562 Fixes phoron sprites. (#3100)
* Fixes phoron sprites.

* Re-adds the phoron-tank changes for the vox???

* touches up tank sprites
2017-03-20 19:31:42 -05: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
Neerti
e08b8edbd3 Merge pull request #3077 from Anewbe/translator
Ports the translator
2017-03-14 21:23:13 -04:00
Anewbe
ab1812d9ff Adds the ear translator 2017-03-13 20:03:45 -05:00
Anewbe
e2680eff87 Merge pull request #3063 from Anewbe/tank_fix
Changes tank sprite for Vox
2017-03-12 19:26:07 -05:00
Anewbe
f4dd443b01 Ports the translator 2017-03-10 21:46:57 -06:00
Anewbe
ac79f548e7 Sorta implements armor soak, very WIP 2017-03-10 20:26:37 -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
Anewbe
0465613465 Changes tank sprite for Vox 2017-03-08 12:36:43 -06:00
Neerti
fc75357c61 Merge pull request #3054 from Anewbe/healthscanner
Oxyloss shows as cyan
2017-03-06 18:59:27 -05:00