MagmaRam
c7e224b6e2
Merge pull request #3075 from Anewbe/armor_soak
...
Implements Armor Soak
2017-03-28 20:02:00 -05:00
MagmaRam
add4607d98
Merge pull request #3159 from Anewbe/electric_welder
...
Adds the electric welder
2017-03-28 19:56:43 -05: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
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
d66e1beca0
Adds the electric welder
2017-03-27 22:43:20 -05:00
Yoshax
19fc61725d
Properly fixes logic
2017-03-28 03:20:02 +01: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
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
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
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
Belsima
50bc49ff86
Five minutes instead.
2017-03-25 17:29:37 -04: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
nachomeep
fda29e2bc0
big sprite update for skrell
2017-03-25 10:08:03 -04:00
Anewbe
14b9f7ce79
Adds bench presets
2017-03-24 22:46:43 -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
Anewbe
3c1d897fc4
Actually gets the HI name right
2017-03-24 15:27:55 -05: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
Arokha Sieyes
fbb73e1ed8
Merge branch 'master' into robot
2017-03-22 18:45:25 -04: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
be36363a23
Ports several Paradise sound emotes ( #3039 )
...
* Ports several Paradise sound emotes
* Comment out scream MORE.
* Remove goonsounds, references
2017-03-22 16:11:55 -05:00
Arokha Sieyes
ae68468861
Allow AI to use custom holograms ( #3114 )
...
* Compound icon generator proc
Why didn't this exist before? Am I missing something? I need manipulatable icons of existing atoms including their overlays. Is there some easier way to get them than this...?
* Polaris Portion of AI Upgrade
2017-03-22 16:09:04 -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
Anewbe
68a335b0c5
Xeno race tweaks
2017-03-21 23:31:10 -05:00
