Cerebulon
55fd0a2041
Adds hand sprites to many items in the engineering department
2017-03-29 04:09:33 +01:00
MagmaRam
d98745d9d3
Merge pull request #3169 from Anewbe/italics_switch
...
Italics switch from / to | characters
2017-03-28 21:54:23 -05:00
Anewbe
cdf69e0eec
Italics switch from / to | characters
2017-03-28 21:13:46 -05:00
Cerebulon
d5a9e15f28
Fixed get_FBP_type() method for determining min/max ages to use new type names.
2017-03-29 03:07:52 +01:00
MagmaRam
a3c83ac025
Robots, cyborgs, etc can now use grinders in the kitchen and chemlab
2017-03-28 20:47:38 -05:00
Anewbe
f91431fefa
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cigarette_sprites
2017-03-28 20:36:48 -05:00
Anewbe
7ae8d934f5
Should fix a Travis issue
2017-03-28 20:24:17 -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
MagmaRam
ff78d25ca1
Merge pull request #3160 from Anewbe/robo_climb
...
Borgs can climb
2017-03-28 19:57:19 -05:00
MagmaRam
add4607d98
Merge pull request #3159 from Anewbe/electric_welder
...
Adds the electric welder
2017-03-28 19:56:43 -05:00
Cerebulon
dfe5afe197
Changes character setup to use correct in-lore names for brain types.
2017-03-29 01:55:46 +01:00
Anewbe
0924e4e7a2
Merge pull request #3135 from Belsima/skrell
...
Skrell sprite updates.
2017-03-28 18:28:58 -05:00
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
Yoshax
b7f0e47be1
Fixes a few things
2017-03-28 21:15:45 +01:00
Anewbe
a65722929f
Merge pull request #3086 from ghost/robot
...
Adds a fuckton of robot, hologram, and AI sprites.
2017-03-28 14:38:08 -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
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