Anewbe
2253838114
Merge pull request #3163 from VOREStation/shuttlebetter
...
Shuttle system tweaks
2017-03-28 14:00:16 -05:00
Arokha Sieyes
77a73a898a
Shuttle system tweaks
...
Fixes one line of code and touches up cryo shuttle look
2017-03-28 11:59:36 -04:00
Schnayy
5cf0d35d1d
Adds Department Color Jackets
...
Moves/renames red&black jacket to sec_dep_jacket, adds supply, engineering, medical, and science jackets. Puts them all in the loadout.
Have one issue: when the jacket is open there are no handsprites. How do I fix that without duplicating sprites?
2017-03-28 03:39:10 -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
b5696a9c6f
Merge pull request #3155 from Schnayy/flower_crowns2
...
Flower crowns with fixed conflict? Maybe? Please?
2017-03-27 23:32:47 -05:00
Anewbe
6e7aa75835
Merge pull request #3141 from VOREStation/shuttlebetter
...
Dynamic Shuttle Walls/Landings
2017-03-27 23:26:35 -05:00
Anewbe
77886b648c
Fixes a travis issue
2017-03-27 23:22:36 -05:00
Anewbe
b1620cfa20
Borgs can climb
2017-03-27 23:15:13 -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
Yoshax
19fc61725d
Properly fixes logic
2017-03-28 03:20:02 +01:00
Anewbe
ff21e5d786
FBPs should no longer scream when they collapse
2017-03-27 17:52:09 -05:00
Schnayy
0f98eedab4
Fixed indentation
2017-03-27 17:16:06 -05:00
Yoshax
567e4ff819
Removes some duplicate vars and improves on auto-rollability detection logic, along with general icon application logci
2017-03-27 22:16:39 +01:00
Yoshax
7e9a15e56f
Fixes some missing icons
2017-03-27 22:04:50 +01:00
Neerti
d2078e86d6
Merge pull request #3149 from Anewbe/jackets
...
Reworks how some jackets open
2017-03-27 16:44:43 -04:00
Schnayy
971eb97399
Fixed conflict? Maybe? Please?
2017-03-27 00:42:39 -05:00
Yoshax
3a483995e0
Splits rolled down suits and rolled up sleeves into their own icon files
2017-03-27 03:39:11 +01:00
Yoshax
ba7cad162d
Revert "Makes space in the uniforms.dmi file"
...
This reverts commit 6b0500dd27
2017-03-27 03:34:12 +01:00
Yoshax
1811b6744f
Revert "Fixed the things"
...
This reverts commit 511f8ce708
2017-03-27 03:34:03 +01:00
Neerti
91fa4c3743
Merge pull request #3151 from Anewbe/smokings_a_drag
...
Adds taking drags from smokables
2017-03-26 21:38:07 -04:00
Arokha Sieyes
52130160db
Adds Body Markings
...
So you can customize your character with tattoos or fur colors for Taj or whatever. I'll let Anewbe work out what he wants to whitelist other than what I did already.
The icons are sliced up with the HumanScissors program I wrote, so they are per-organ. So, lop off a limb, put it on someone else, they have the tattoos and whatnot. It's part of DNA so it comes with when cloning.
They are defined in the normal sprite_accessories file and the icons are all in markings.dm in the format of "markingname-organtag" so if you have a marking that spans both arms and torso you need "thatone-torso", "thatone-l_arm", "thatone-r_arm" icon states.
2017-03-26 19:36:34 -04:00
Anewbe
431dd1d290
Adds taking drags from smokables
2017-03-26 18:07:35 -05:00
Anewbe
d665a0dee2
Makes translators more expensive
2017-03-26 17:36:36 -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
Anewbe
9fedcf7d1e
Merge pull request #3145 from Cerebulon/medical_handsprites
...
Added hand sprites to most medical items.
2017-03-26 17:06:10 -05:00
Anewbe
2e5e77997a
Reworks how some jackets open
2017-03-26 16:58:27 -05:00
Anewbe
22ae87c376
Fixes a bug with meatbrain FBPs.
2017-03-26 16:34:47 -05:00
Cerebulon
6472f02040
Removed unnecessary icon_state code. Added basic scanner sprite.
2017-03-26 22:00:09 +01:00
Anewbe
511f8ce708
Fixed the things
2017-03-26 11:44:50 -05: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
Arokha Sieyes
1300ef333d
Dynamic Shuttles - Code and Icon Changes
2017-03-25 21:00:08 -04:00
Neerti
629a044761
Merge pull request #3137 from Anewbe/robot_skintone
...
Adds skintone to FBPs
2017-03-25 20:57:01 -04:00
Schnayy
ade40d627e
Added 3 clothing sprites w/ appropriate ground/held sprites. ( #3134 )
...
* Added 3 clothing sprites w/ appropriate ground/held sprites.
1, white yoga pants, intended to be any color.
2, white kimono, intended to be any color.
3, red and black jacket.
All intended to be in the loadout.
* Put coding in. Jacket has pockets, same cold resistance as a hoodie. Kimono and yoga pants have color selectors. All are in the loadout.
* Removed cold protection from jacket & fixed missing mob sprites. Don't know what happened with the latter, was definitely there when I tested it.
2017-03-25 17:44:04 -05:00
Neerti
d0fa0c4eed
Merge pull request #3140 from Anewbe/antag_age_fix
...
Fixes the antag age blocker
2017-03-25 18:28:09 -04:00
Schnayy
8bb5924481
Adds greyscale sprites for heels worn/held/on the ground. ( #3133 )
...
* Adds greyscale sprites for heels worn/held/on the ground. Still needs coding. First commit, hope I do it right!
* Fixed capitalization, added coding.
* Rennamed heelsheld to heels, as per anewbe's request.
2017-03-25 16:48:39 -05:00
Anewbe
f316fd2dca
Merge pull request #3136 from Belsima/master
...
Updates drone respawn time.
2017-03-25 16:37:08 -05:00
Anewbe
6cd424b2e1
Fixes the antag age blocker
2017-03-25 16:36:17 -05:00
Belsima
50bc49ff86
Five minutes instead.
2017-03-25 17:29:37 -04:00
Anewbe
88b0c6086e
Antag Radio changes
2017-03-25 14:19:57 -05:00
Anewbe
d90699998b
Adds skintone to FBPs
2017-03-25 13:55:49 -05:00
nachomeep
9c86db2669
dron respawn time change
2017-03-25 14:37:06 -04:00
Anewbe
81d401c7e0
Removes the testing code
2017-03-25 10:54:55 -05:00
Neerti
eb73ee4b44
Merge pull request #3120 from Anewbe/alien_tweaks
...
Xeno race tweaks
2017-03-25 11:27:22 -04:00
Neerti
90df4dbd34
Merge pull request #3130 from Anewbe/clone_memory_disorder
...
Adds text for CMD to the cloning message
2017-03-25 11:26:17 -04:00
Neerti
09fc4dbd7c
Merge pull request #3131 from Anewbe/benches
...
Adds bench presets
2017-03-25 11:25:49 -04:00
nachomeep
fda29e2bc0
big sprite update for skrell
2017-03-25 10:08:03 -04:00
Anewbe
3ba498fc47
Fixes the fake command report
2017-03-24 22:57:09 -05:00
