Commit Graph

7556 Commits

Author SHA1 Message Date
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
440b71331d Merge pull request #3197 from Anewbe/lung_pop_and_brain
Lung damage QOL
2017-04-01 17:48:15 -04:00
Neerti
08f3173409 Merge pull request #3180 from Anewbe/carpspam
Gives fish an item drop
2017-04-01 17:47:40 -04:00
Neerti
5297089269 Merge pull request #3196 from Anewbe/self_target
Shouldn't miss yourself with your hands anymore.
2017-04-01 17:47:30 -04:00
Anewbe
e116eeb919 Move brain damage from Oxyloss 2017-04-01 11:52:50 -05:00
Anewbe
a0c1180fd0 Lung damage QOL 2017-04-01 00:10:18 -05:00
Anewbe
d8049a081f Shouldn't miss yourself with your hands anymore. 2017-03-31 23:52:52 -05:00
MagmaRam
7690a91c8f Splints will now show up on all limbs. 2017-03-31 23:22:13 -05:00
Anewbe
14fd8cce7c Gives fish an item drop 2017-03-31 22:01:34 -05:00
Anewbe
91be79fdb3 Tweaks a bunch of body markings 2017-03-31 15:17:02 -05:00
Anewbe
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
Arokha Sieyes
44293624ff 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:33:45 -04:00
Anewbe
5ceb96dfb5 Merge pull request #3186 from VOREStation/runtimes-fix
Fix Runtimes
2017-03-30 21:53:22 -05:00
Anewbe
cf9e3f8789 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into overdose_boogaloo 2017-03-30 20:51:13 -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
d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks
Adds Body Markings
2017-03-30 20:13:15 -05:00
Anewbe
f7d086fa59 Overdose is more dangerous, Bicaridine works again 2017-03-30 20:09:21 -05:00
Arokha Sieyes
c828a85f06 Adds Body Markings - VOREStation Species
Vulps! And removes whitelist for parts.
2017-03-30 18:57:48 -04:00
Arokha Sieyes
e116f08d24 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-30 18:05:20 -04:00
Arokha Sieyes
339806fcc2 Merge pull request #1288 from VOREStation/aro-licklimit
Add cooldowns to licking and dogborgs
2017-03-30 14:51:00 -04:00
Arokha Sieyes
a8ebc54170 One-click mouse scooping and edibility
Makes mice scoopable with one click, and can be ate rather than needing to be grabbed.

Resolves #1255
2017-03-30 14:07:30 -04: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
Arokha Sieyes
ea52a15c90 Add cooldowns to licking and dogborgs
They didn't have one, now it's the default attack click cooldown time.

Resolves #1266
2017-03-30 12:52:53 -04:00
Anewbe
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
Arokha Sieyes
83a782a3de Copypaste error on *squish
Whups!
2017-03-29 14:15:07 -04:00
Anewbe
cdf69e0eec Italics switch from / to | characters 2017-03-28 21:13:46 -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
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
Arokha Sieyes
fce6634ef7 Merge pull request #1273 from VOREStation/aro-synthfix
Prevent synths overheating inside mechs/people in space
2017-03-28 19:13:09 -04:00
Arokha Sieyes
777ee87319 Prevent synths overheating inside mechs/people in space
This is a weird if() statement and should be revisited. This is just a quick patch to allow synths to actually use mechs in space, as well as be prey to people who step onto space turfs. Rule of fun and all.
2017-03-28 19:03:10 -04:00
Arokha Sieyes
5c805c93ce Merge pull request #1267 from VOREStation/aro-beepskysmash
Adds beepsky and makes him baton more
2017-03-28 16:26:31 -04:00
Arokha Sieyes
6bc464be7c Beepsky+Baton=Win 2017-03-28 16:16:38 -04: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
Arokha Sieyes
740953215d Adds wolfgirls
AwoooOOOOooo!

http://imgur.com/nsOIiTR
2017-03-28 13:29:14 -04: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
Arokha Sieyes
b88c04f96c Merge pull request #1252 from VOREStation/aro-vwag
One more vwag tweak
2017-03-26 22:05:27 -04:00
Arokha Sieyes
12d8d9f570 One more vwag tweak 2017-03-26 21:08:53 -04:00
Arokha Sieyes
5e8d8e082f Merge pull request #1251 from VOREStation/aro-sync2
Polaris Sync
2017-03-26 20:45:00 -04:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Arokha Sieyes
32017be265 Fix unsupported tail spam
For vwag stuff.
2017-03-26 19:55:47 -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
22ae87c376 Fixes a bug with meatbrain FBPs. 2017-03-26 16:34:47 -05:00