Arokha Sieyes
c57e6e75b7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
Line ending changes?
2017-04-02 23:25:59 -04:00
Anewbe
5dcd63b6b9
Merge pull request #3213 from VOREStation/aro-pol-nanosize
...
Fix nanopaste item size
2017-04-02 19:46:17 -05:00
Arokha Sieyes
4807b4e6e0
Fix nanopaste item size
...
I'm pretty sure this is an oversight, rather than a balance thing. Nanopaste is too big to fit in boxes or anywhere else, but seems to be identical to all other 10-stack items like medical stacks in other regards. It should probably be the same size as the other 10-stack items.
Even the icon seems to suggest this, since right now it is just as big as an entire box, though the icon seems to be more like toothpaste-tube and looks awkward sitting in the huge backdrop inventory space.
2017-04-02 19:33:25 -04:00
Anewbe
1bc8b9d716
Merge pull request #3200 from Atermonera/Translator_Languages
...
Translators and animal languages
2017-04-02 11:04:22 -05:00
Atermonera
d9c68e5b9b
Translators still check against hiveminds
2017-04-01 17:49:34 -07:00
Atermonera
971cd2da30
Translators don't understand animals and other languages that recorders can't record.
2017-04-01 16:48:01 -07:00
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
Neerti
89088cdbda
Merge pull request #3199 from Anewbe/flower_crowns
...
Wooden circlets can now be worn as hats
2017-04-01 17:47:09 -04:00
Anewbe
1ea5252f5d
Merge pull request #3181 from VOREStation/vplk-pipelayer
...
Modernize the automatic pipe layer
2017-04-01 15:59:05 -05:00
Anewbe
27b1db523e
Wooden circlets can now be worn as hats
2017-04-01 15:31:06 -05: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
Leshana
ab4c63791a
Modernize the automatic pipe layer
...
* Upgrades the automatic pipe layer to modernize its code a bit towards latest standards and fixing various bugs.
* Make it constructable so it can acutally be used by someone!
2017-03-30 18:13:37 -04: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
killer653
0cf24cd709
Bugfix, cleanup, & xenoarch belter access
2017-03-28 18:01:02 -04: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
1ba87bea73
Merge polaris sync
2017-03-28 12:24:46 -04: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
Arokha Sieyes
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04: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
Leshana
f0270451a7
Added vore capabilies to the new simple_animal system.
...
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype. Instead we simply enable vore on the main type. Consensus being we don't need a type for non-vore versions of stuff.
* This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values. In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04: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
