Neerti
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
6a95f6c87f
Merge branch 'master' into apron_pockets
2017-04-04 17:54:38 -05:00
Neerti
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
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
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
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
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
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
Anewbe
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
Cameron653
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
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
Neerti
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
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
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
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
Cerebulon
98d3ebf6dd
Fixed full options not showing up for non-FBPs. Repeated more thorough testing with newest changes.
2017-04-01 03:09:55 +01:00
MagmaRam
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
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
MagmaRam
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
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
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