Anewbe
dc58616dc8
Merge pull request #3153 from Yoshax/iconsplitting
...
'Improved' solution to the full uniform.dmi problem
2017-03-28 18:22:04 -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
Yoshax
ba7cad162d
Revert "Makes space in the uniforms.dmi file"
...
This reverts commit 6b0500dd27
2017-03-27 03:34:12 +01:00
Anewbe
431dd1d290
Adds taking drags from smokables
2017-03-26 18:07:35 -05:00
Neerti
565fea9648
Merge pull request #3144 from Anewbe/uniforms
...
Makes space in the uniforms.dmi file
2017-03-26 18:14:06 -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
6b0500dd27
Makes space in the uniforms.dmi file
2017-03-26 00:59:14 -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
MagmaRam
d603394226
Merge pull request #3121 from Anewbe/borg_zap
...
Borg stun arm should work now
2017-03-22 19:42:01 -05:00
Anewbe
538f91c202
Borg stun arm should work now.
2017-03-22 17:06:16 -05:00
Anewbe
38598f3aae
Merge pull request #3118 from Neerti/3/6/2017_surface_map
...
Continues work on the surface map
2017-03-22 16:33:40 -05:00
Arokha Sieyes
9660186dfd
Not So Simple Animals ( #3103 )
...
* Merge two not-really conflicts
Thanks git, that whitespace conflict was super important?
* DME merge
* Added defines for mobs used by simple animals.
* Lost a slime along the way
* Disable debug settings
* HONK!!!
* Remove redundant hostile decls
* Replace loc= with forceMove in old SA code
I guess I should think of the children.
2017-03-22 14:30:07 -05:00
nachomeep
e1554f323b
Adds engineering + science crates ( #3072 )
...
* Adds engineering + scicrates.
* Enables the science crate
* Updates engineering crate icons.
* Inflatables don't need security.
* fixes RCD crates
2017-03-21 18:38:47 -05:00
Neerti
b571ed9c66
Continues work on the surface map
2017-03-21 16:11:13 -04:00
Neerti
7d1245d180
Merge pull request #3113 from Anewbe/easy_communicators
...
Communicator QoL
2017-03-21 02:17:27 -04:00
Anewbe
c65588b099
Communicator QoL
2017-03-21 00:51:26 -05:00
Anewbe
f796914849
Fixes a thing with jetpacks
2017-03-21 00:27:31 -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
Neerti
accf43e644
Merge pull request #3093 from Anewbe/translator_tweaks
...
Translators can't output hive or nonverbal languages
2017-03-17 08:52:31 -04:00
Anewbe
458f9ce6d4
Merge pull request #3096 from VOREStation/paraflate
...
Add one inflatables kit to paramedic lockers
2017-03-16 22:50:53 -05:00
Arokha Sieyes
400b0749aa
Add one inflatables kit to paramedic lockers
...
Makes sense to meeee. Hopefully it does to you, too. Gotta rescue those people!
2017-03-15 23:56:52 -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
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
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
Leshana
a5a805414b
Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
...
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not. The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Neerti
fc75357c61
Merge pull request #3054 from Anewbe/healthscanner
...
Oxyloss shows as cyan
2017-03-06 18:59:27 -05:00
Anewbe
b4ec8eb026
Oxyloss shows as cyan
2017-03-05 14:19:51 -06:00
Anewbe
05e6ef5ad8
Merge pull request #2988 from Anewbe/boots
...
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
Anewbe
e2a9b64174
Merge pull request #3043 from Leshana/blueprints
...
Extend Station Blueprints to consider outdoor mining areas as "space"
2017-03-05 14:11:45 -06:00
Anewbe
19710d9bd8
Reworks empulse and emp_act
2017-03-05 12:22:45 -06:00
Anewbe
283071d9db
Merge pull request #3035 from Neerti/3/2/2017_example_map
...
Adds Multi-Z Test Map
2017-03-04 15:26:49 -06:00
Leshana
340a393161
Extend Station Blueprints to consider outdoor mining areas as "space"
...
* Allows constructing new rooms out of the asteroid! Previously blueprint couldn't because it wasn't technically "/area/space"
* Also moved the list of what area types count as space or protected to variables so its not a list embedded in the middle of a proc...
2017-03-03 20:12:03 -05:00
Anewbe
facd055d07
Merge pull request #3037 from VOREStation/traybuckle
...
Fix two extra robust bugs
2017-03-03 18:23:25 -06:00
Arokha Sieyes
f7c22dc54d
Fix two extra robust bugs
...
Trays have no attack cooldown because they have this crazy-long snowflake code for attacks.
Beds (and children like chairs) don't track target for grab-buckle do_after, letting them run away and get teleported back to the chair and buckled regardless of their efforts.
2017-03-03 16:25:53 -05:00
Neerti
0f781e36a7
Adds Multi-Z Test Map
2017-03-03 09:40:34 -05:00
Anewbe
25b925f04c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
...
# Conflicts:
# maps/northern_star/polaris-1.dmm
# maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe
bb2adf1290
Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
...
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
Anewbe
acf30da072
Merge pull request #3033 from VOREStation/surgidesc
...
Fixes descriptions on 3 surgical tools
2017-03-02 15:23:27 -06:00
Arokha Sieyes
55d5c2d615
Fixes descriptions on 3 surgical tools
...
Someone forgot theeeese. So they showed the "Ahelp this" description.
2017-03-02 14:08:13 -05:00
Neerti
561f10bced
Merge pull request #3013 from Anewbe/lung_cancer
...
Minor smoking update
2017-02-28 21:28:27 -05:00
