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 and GitHub
3a0dadb1cb
Merge pull request #3229 from Anewbe/item_slowdown
...
Tweaks mob slowdown
2017-04-05 22:35:53 -04:00
Neerti and GitHub
6a1451f5f0
Merge pull request #3230 from PolarisSS13/revert-3136-master
...
Revert "Updates drone respawn time."
2017-04-05 22:34:46 -04:00
Neerti and GitHub
dbbd1f946e
Merge pull request #3231 from Anewbe/headbutt
...
Renames the proc for headbutting
2017-04-05 22:34:23 -04:00
Anewbe
ec7dbc1930
Renames the proc for headbutting
2017-04-05 15:55:35 -05:00
Anewbe and GitHub
5dfc85e629
Merge pull request #3226 from Yoshax/lemat
...
Adds a LeMat Revolver
2017-04-05 13:32:16 -05:00
Anewbe and GitHub
0184cea5f2
Revert "Updates drone respawn time."
2017-04-05 12:29:15 -05:00
Yoshax
530a2b5c60
Adds a LeMath Revolver
2017-04-05 14:29:24 +01: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 and GitHub
66c06a02f2
Merge pull request #3225 from VOREStation/aro-pol-netbetter
...
Make energy nets better
2017-04-04 22:13:38 -05:00
Anewbe and GitHub
22c2e852ad
Merge pull request #3224 from VOREStation/aro-pol-satweaks
...
Simple Animal Tweaks
2017-04-04 20:51:43 -05:00
Leshana and Arokha Sieyes
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
Neerti and GitHub
8d9b7f1135
Merge pull request #3203 from Anewbe/apron_pockets
...
Aprons now have pockets
2017-04-04 19:09:47 -04:00
Neerti and GitHub
d275142e7a
Merge pull request #3219 from Anewbe/negative_armor_pen
...
Adds hollowpoint rounds, for bears and such
2017-04-04 18:55:59 -04:00
Anewbe and GitHub
6a95f6c87f
Merge branch 'master' into apron_pockets
2017-04-04 17:54:38 -05:00
Neerti and GitHub
0c6b67a30d
Merge pull request #3214 from Anewbe/fbp_limb_tweak
...
Robolimbs last longer without negative effects
2017-04-04 18:53:22 -04:00
Anewbe and GitHub
9178422779
Merge pull request #3212 from VOREStation/aro-pol-cellicon
...
Make cells show correct icon when they spawn
2017-04-04 17:50:56 -05: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 and GitHub
c52bab3439
Merge pull request #3201 from Anewbe/vox_weapons
...
Tweaks the Vox weapons
2017-04-03 21:13:19 -04:00
Anewbe
bfb3871ec3
Adds hollowpoint rounds, for bears and such
2017-04-03 18:27:19 -05:00
Neerti and GitHub
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 and GitHub
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
Anewbe
cb877ab09a
Robolimbs last longer without negative effects
2017-04-02 19:35:31 -05:00
Arokha Sieyes
e69f5bf981
Make cells show correct icon when they spawn
...
Initialize is great for cells sitting on a counter or something when the map loads. But not really for cells in guns that R&D prints and stuff. Kinda needs to be in New().
2017-04-02 19:28:11 -04:00
Atermonera
67d9f03e4d
FBPs can have numbers in their names.
2017-04-02 13:53:49 -07:00
Anewbe and GitHub
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 and GitHub
1bc8b9d716
Merge pull request #3200 from Atermonera/Translator_Languages
...
Translators and animal languages
2017-04-02 11:04:22 -05:00
Anewbe
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
Cameron653 and GitHub
77f6d2fd78
Makes Carthatoline actually creatable
...
The ID for dylovene is "anti_toxin" not "dylovene"
2017-04-02 01:26:40 -04:00
Anewbe
88b22cd5da
Tweaks the Vox weapons
2017-04-01 22:41:46 -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 and GitHub
440b71331d
Merge pull request #3197 from Anewbe/lung_pop_and_brain
...
Lung damage QOL
2017-04-01 17:48:15 -04:00
Neerti and GitHub
08f3173409
Merge pull request #3180 from Anewbe/carpspam
...
Gives fish an item drop
2017-04-01 17:47:40 -04:00
Neerti and GitHub
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
Neerti and GitHub
89088cdbda
Merge pull request #3199 from Anewbe/flower_crowns
...
Wooden circlets can now be worn as hats
2017-04-01 17:47:09 -04:00
Anewbe and GitHub
29a25cc9b0
Merge pull request #3164 from Cerebulon/synth_brain_rename
...
Changes character setup to use correct in-lore names for brain types.
2017-04-01 16:00:19 -05:00
Anewbe
27b1db523e
Wooden circlets can now be worn as hats
2017-04-01 15:31:06 -05:00
Anewbe
ae3d790cd2
Fixes heels and the maps
2017-04-01 13:15:00 -05: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 and GitHub
acee0a225f
Merge pull request #3195 from MagmaRam/splints
...
Splints
2017-04-01 12:00:32 -05:00
Anewbe
e116eeb919
Move brain damage from Oxyloss
2017-04-01 11:52:50 -05:00
Yoshax
6b794bb9d7
Small tea drinks bugfix
2017-04-01 14:10:32 +01:00
Anewbe