Anewbe
7bb3f5fbb7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# code/datums/supplypacks/medical.dm
# code/game/objects/structures/crates_lockers/closets/wardrobe.dm
# code/modules/clothing/shoes/miscellaneous.dm
# code/modules/clothing/suits/labcoat.dm
# icons/mob/back.dmi
# icons/mob/feet.dmi
# icons/mob/human_face.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/shoes.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/storage.dmi
# maps/northern_star/polaris-2.dmm
# maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Anewbe and GitHub
acee0a225f
Merge pull request #3195 from MagmaRam/splints
...
Splints
2017-04-01 12:00:32 -05:00
Yoshax
6b794bb9d7
Small tea drinks bugfix
2017-04-01 14:10:32 +01:00
MagmaRam
7690a91c8f
Splints will now show up on all limbs.
2017-03-31 23:22:13 -05:00
MagmaRam and GitHub
4000be7ec5
Merge pull request #3191 from Anewbe/flashlight_options
...
Adds a few more cosmetic flashlights
2017-03-31 20:07:42 -05:00
Anewbe
ca47d37d2f
Adds a few more cosmetic flashlights
2017-03-31 18:50:00 -05:00
Anewbe
91be79fdb3
Tweaks a bunch of body markings
2017-03-31 15:17:02 -05:00
Anewbe and GitHub
cc3e91de21
Merge pull request #3188 from VOREStation/aro-pol-bodymarks
...
Symbols make sprite accessories freak out
2017-03-31 00:58:15 -05:00
Arokha Sieyes
7f99b3b45d
Symbols make sprite accessories freak out
...
Like plus or ampersand or single or escaped quotes in the name, it goes crazy. You can't remove Socks+Belly because it has a plus, once you've added it. I have no idea why. But here's a quick fix.
2017-03-31 01:48:00 -04:00
Anewbe and GitHub
5ceb96dfb5
Merge pull request #3186 from VOREStation/runtimes-fix
...
Fix Runtimes
2017-03-30 21:53:22 -05:00
MagmaRam and GitHub
8b541292a5
Merge pull request #3183 from Anewbe/overdose_boogaloo
...
Overdose is more dangerous, Bicaridine works again
2017-03-30 21:00:44 -05:00
MagmaRam and GitHub
4e43960fcf
Merge pull request #3177 from Anewbe/doona_organs
...
Diona limbs should be easier to remove
2017-03-30 20:53:45 -05:00
Anewbe
cf9e3f8789
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into overdose_boogaloo
2017-03-30 20:51:13 -05:00
MagmaRam and GitHub
34e398d328
Merge pull request #3175 from Anewbe/hands_things
...
Device Cell QOL
2017-03-30 20:49:24 -05:00
Leshana
379ac4c63d
Fix Runtimes
...
click.dm fixes:
[09:46:49] Runtime in unsorted.dm,1293: list index out of bounds
proc name: screen loc2turf (/proc/screen_loc2turf)
[09:46:49] Runtime in click.dm,345: Cannot execute null.Click().
proc name: Click (/obj/screen/click_catcher/Click)
paper_bundle.dm fixes:
[10:30:21] Runtime in paper_bundle.dm,183: Cannot read null.loc
proc name: Topic (/obj/item/weapon/paper_bundle/Topic)
human.dm fixes:
12:27:51] Runtime in human.dm,1476: Cannot read null.name
proc name: Toggle Underwear (/mob/living/carbon/human/verb/toggle_underwear)
2017-03-30 21:20:31 -04:00
Anewbe and GitHub
d59f0f1dc4
Merge pull request #3152 from VOREStation/aro-pol-bodymarks
...
Adds Body Markings
2017-03-30 20:13:15 -05:00
Anewbe and GitHub
2867f17b51
Merge pull request #3162 from Schnayy/department_jackets
...
Adds Department Color Jackets
2017-03-30 20:11:39 -05:00
Anewbe
f7d086fa59
Overdose is more dangerous, Bicaridine works again
2017-03-30 20:09:21 -05:00
Anewbe and GitHub
9a9849d56c
Merge pull request #3179 from VOREStation/vplk-fish
...
Added a few fish as simple animals
2017-03-30 15:37:46 -05:00
Anewbe and GitHub
dc12d9b42f
Merge pull request #3171 from Cerebulon/engineer_hand_sprites
...
Adds hand sprites to many engineering items
2017-03-30 14:27:45 -05:00
Leshana
b562941377
Added a few fish as simple animals
...
* They are simple non-hostile simple_animal's that wander around a bit.
* Wandering code is overriden so they will not leave the water. And they will take damage as an unsuitable atmosphere if they do.
* Fish sprites improved and animated by Kligor
2017-03-30 13:09:11 -04:00
Yoshax
fb7da48588
Fixes an issue with smes deconstruction
2017-03-30 16:42:11 +01:00
Anewbe
caea997f7d
Diona limbs should be easier to remove
2017-03-29 14:58:12 -05:00
Schnayy
a5384dab83
Fixed in-hand sprites, made adjustment to open icon.
2017-03-29 14:00:57 -05:00
Anewbe
c9bfabd426
Device Cell QOL
2017-03-29 13:58:35 -05:00
Anewbe and GitHub
e9ad3eba3a
Merge pull request #3174 from VOREStation/aro-pol-squish
...
Copypaste error on *squish
2017-03-29 13:25:12 -05:00
Arokha Sieyes
a66eba807f
Copypaste error on *squish
...
Whups!
2017-03-29 14:16:16 -04:00
Cerebulon
1d09caa08d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into engineering_sprites
2017-03-29 06:24:06 +01:00
Cerebulon
365f92101d
Reverted botched changes.
2017-03-29 05:49:44 +01:00
Cerebulon
55fd0a2041
Adds hand sprites to many items in the engineering department
2017-03-29 04:09:33 +01:00
MagmaRam and GitHub
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
MagmaRam
a3c83ac025
Robots, cyborgs, etc can now use grinders in the kitchen and chemlab
2017-03-28 20:47:38 -05:00
Anewbe
7ae8d934f5
Should fix a Travis issue
2017-03-28 20:24:17 -05:00
MagmaRam and GitHub
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 and GitHub
9ff0180315
Merge pull request #3138 from Anewbe/radio_freqs
...
Antag Radio changes
2017-03-28 20:02:44 -05:00
MagmaRam and GitHub
33dffeb0b8
Merge pull request #2955 from Anewbe/heart_damage
...
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
MagmaRam and GitHub
c7e224b6e2
Merge pull request #3075 from Anewbe/armor_soak
...
Implements Armor Soak
2017-03-28 20:02:00 -05:00
MagmaRam and GitHub
add4607d98
Merge pull request #3159 from Anewbe/electric_welder
...
Adds the electric welder
2017-03-28 19:56:43 -05:00
Anewbe and GitHub
0924e4e7a2
Merge pull request #3135 from Belsima/skrell
...
Skrell sprite updates.
2017-03-28 18:28:58 -05:00
Anewbe and GitHub
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 and GitHub
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
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 and GitHub
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 and GitHub
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
Anewbe
73ab115295
Fixes a thing.
2017-03-27 22:32:02 -05:00
Anewbe