Neerti
e2e85e3702
Fixes Immortal (to melee) Borgs
2017-04-09 00:24:45 -04:00
Anewbe
e9c4b5a3eb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# icons/mob/back.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
SinTwo
828cffb25f
If observing before roundstart, you may respawn.
2017-04-07 12:52:22 -04:00
Neerti
3a0dadb1cb
Merge pull request #3229 from Anewbe/item_slowdown
...
Tweaks mob slowdown
2017-04-05 22:35:53 -04:00
Neerti
6a1451f5f0
Merge pull request #3230 from PolarisSS13/revert-3136-master
...
Revert "Updates drone respawn time."
2017-04-05 22:34:46 -04:00
Anewbe
ec7dbc1930
Renames the proc for headbutting
2017-04-05 15:55:35 -05:00
Anewbe
0184cea5f2
Revert "Updates drone respawn time."
2017-04-05 12:29:15 -05:00
Anewbe
5c9fce07f4
Renames the species var
2017-04-04 23:13:19 -05:00
Anewbe
1513842608
Tweaks mob slowdown
2017-04-04 23:02:56 -05:00
Anewbe
66c06a02f2
Merge pull request #3225 from VOREStation/aro-pol-netbetter
...
Make energy nets better
2017-04-04 22:13:38 -05:00
Anewbe
22c2e852ad
Merge pull request #3224 from VOREStation/aro-pol-satweaks
...
Simple Animal Tweaks
2017-04-04 20:51:43 -05:00
Leshana
3530f71530
Prevent pets from resisting out of being buckled to chairs.
...
* Simple animals won't resist out of being buckled while idle. This lets them be buckled on shuttles etc. They still will resist out when they lock onto a target etc.
2017-04-04 20:16:38 -04:00
Arokha Sieyes
1dfed9514c
Make energy nets better
...
You can imagine them as 8-second-resist office chairs that the mob is buckled to now. You can pull them around in the net, too, since it's baaaasically like an office chair now. They can't pull themselves around like office chairs while in the net, though. Because that'd be hax. You can click them (or resist) to start tearing them up (same from the outside).
Also keep in mind the mob inside can still wreck anyone adjacent (or shoot you). That's how it was before, too. So you can't really run up and drag them to prevent escape without them punching you (shouldn't you be roleplaying all this anyway?). Switching hands interrupts the resist so no reloading, getting other weapons, using PDA etc while resisting.
Also got rid of this SUPER SNOWFLAKE VARIABLE on all mobs used literally only by energy nets.
2017-04-04 20:15:51 -04:00
Arokha Sieyes
aed4bfb3c4
Simple Animal Tweaks
...
They can resist out of closets, buckles, and when calling for help, if the helpers can see the issue, they don't just follow the caller, they attack the issue. This means that retaliate class mobs properly assist in fights for the mob who is retaliating.
2017-04-04 17:37:15 -04:00
Cerebulon
340845babd
Fixed various hand sprite issues.
...
Several circuit boards/modules did not have sprites despite hands sprites existing.
Green and pink lunch/tool boxes appeared in the wrong place in the right hand.
Fixed defib sprite for new code, and added jumper cable sprite.
2017-04-04 08:29:53 +01:00
Neerti
6126cf5eaf
Merge pull request #3218 from Anewbe/automute
...
Automute shouldn't go off if you didn't type anything
2017-04-03 18:35:02 -04:00
Anewbe
1e7bf50a4c
Automute shouldn't go off if you didn't type anything
2017-04-03 14:14:52 -05:00
Anewbe
b38986b4b7
Merge pull request #3209 from Atermonera/master
...
FBPs can have numbers in their names.
2017-04-03 13:56:06 -05:00
Yoshax
cd3c77c0b9
Fixes a small body marking thing issue
2017-04-03 18:41:42 +01:00
Atermonera
67d9f03e4d
FBPs can have numbers in their names.
2017-04-02 13:53:49 -07:00
Anewbe
b0ba6c48c1
Merge pull request #3205 from Atermonera/Translator_Languages
...
Restricts animal languages
2017-04-02 12:25:53 -05:00
Atermonera
e7fb196a26
Restricts animal languages
2017-04-02 10:16:15 -07:00
Anewbe
1bc8b9d716
Merge pull request #3200 from Atermonera/Translator_Languages
...
Translators and animal languages
2017-04-02 11:04:22 -05:00
Atermonera
971cd2da30
Translators don't understand animals and other languages that recorders can't record.
2017-04-01 16:48:01 -07:00
Atermonera
85c78001cb
Several simple_animals have their own languages, with custom syllables.
2017-04-01 16:46:28 -07: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
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
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
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
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
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
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
