Commit Graph

3753 Commits

Author SHA1 Message Date
Neerti
e951ff344e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 4/18/2017_modifier_system_and_lings 2017-04-19 13:47:57 -04:00
Anewbe
9d2df21777 Merge pull request #3328 from Neerti/3/14/2017_makeshift_armor
Adds Makeshift Armor
2017-04-19 10:13:20 -05:00
Neerti
ea6128f986 Adds Modifier System, Changes Some Ling Stuff
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc.  The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
Neerti
6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Anewbe
55d895aa14 Merge pull request #3327 from Atermonera/Translator_Languages
Fixes a runtime with borgs and translators
2017-04-17 23:25:01 -05:00
Atermonera
e5e5c446a6 Fixes a runtime with borgs and translators 2017-04-17 21:01:42 -07:00
Anewbe
46d447e478 Merge pull request #3326 from Cerebulon/techoriginsfix
Fixes improperly formatted tech_origins
2017-04-17 20:57:28 -05:00
Cerebulon
843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
MagmaRam
cec43bf3d2 Updates in-game EVA manual 2017-04-17 11:19:39 -05:00
Anewbe
e455aba104 Merge pull request #3254 from Anewbe/wallets
Wallets can now hold permits.
2017-04-15 18:43:17 -05:00
Anewbe
8142c8baa4 Merge pull request #3272 from LorenLuke/PDA-ID
Can remove ID from PDA via Alt-Clicking now.
2017-04-14 17:51:42 -05:00
Neerti
5b4ab95bd5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/14/2017_makeshift_armor 2017-04-14 03:54:23 -04:00
Neerti
cc64f0e537 Merge pull request #3255 from Anewbe/bartender_weapon_permit
Gives the bartender a weapon permit in their spawned item list
2017-04-14 01:04:19 -04:00
LorenLuke
26c3653aec Changes most '<<' to 'to_chat()' 2017-04-13 12:46:04 -07:00
Anewbe
95aff3ae40 Tweaks the message given when a weapon dulls 2017-04-12 16:22:17 -05:00
Anewbe
21d833746d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-12 16:10:58 -05:00
Neerti
920ad74e42 Merge pull request #3279 from Anewbe/borg_cuffs
Should fix borg handcuffs
2017-04-11 21:54:56 -04:00
Arokha Sieyes
7e69bafa53 Another e-net tweak
Exploit where if you started breaking the net from the OUTSIDE, even if pulled away from you, you could break it. Adds a target to the do_after.
2017-04-11 21:03:09 -04:00
Anewbe
fc8c32ea92 Should fix borg handcuffs 2017-04-11 13:12:17 -05:00
LorenLuke
031e63dd7b Can remove ID via Alt-Clicking now. 2017-04-11 00:06:40 -07:00
Anewbe
6a99123f51 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-10 11:26:09 -05:00
Anewbe
736659637f Gives the bartender a weapon permit in their spawned item list. 2017-04-09 14:22:15 -05:00
Anewbe
2f4a788a39 Wallets can now hold permits. 2017-04-09 12:59:47 -05:00
Anewbe
6c169e7ad6 Adds in an Unathi-made jerky snack 2017-04-07 23:36:22 -05: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
Neerti
79a932e559 Merge pull request #3228 from Anewbe/package_bombs
Package bomb changes
2017-04-05 22:36:37 -04:00
Anewbe
584fd3ed30 Missed a test var 2017-04-04 22:38:07 -05:00
Anewbe
40617b7695 Package bomb changes 2017-04-04 22:36:08 -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
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
efbd137924 Merge pull request #3206 from Anewbe/shotgun_permit
Adds permit items, including a gun permit and a bar gun permit
2017-04-04 18:54:40 -04:00
Neerti
aae639dcb2 Merge pull request #3211 from Anewbe/towel_things
Towels dry
2017-04-04 18:53:36 -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
Anewbe
5dcd63b6b9 Merge pull request #3213 from VOREStation/aro-pol-nanosize
Fix nanopaste item size
2017-04-02 19:46:17 -05:00
Arokha Sieyes
4807b4e6e0 Fix nanopaste item size
I'm pretty sure this is an oversight, rather than a balance thing. Nanopaste is too big to fit in boxes or anywhere else, but seems to be identical to all other 10-stack items like medical stacks in other regards. It should probably be the same size as the other 10-stack items.

Even the icon seems to suggest this, since right now it is just as big as an entire box, though the icon seems to be more like toothpaste-tube and looks awkward sitting in the huge backdrop inventory space.
2017-04-02 19:33:25 -04:00
Anewbe
21f2bfc12d Towels dry 2017-04-02 17:34:52 -05:00
Anewbe
c21223e334 Adds permit items, including a gun permit and a bar gun permit 2017-04-02 14:09:53 -05:00
Anewbe
1bc8b9d716 Merge pull request #3200 from Atermonera/Translator_Languages
Translators and animal languages
2017-04-02 11:04:22 -05:00
Atermonera
d9c68e5b9b Translators still check against hiveminds 2017-04-01 17:49:34 -07:00
Atermonera
971cd2da30 Translators don't understand animals and other languages that recorders can't record. 2017-04-01 16:48:01 -07: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
1ea5252f5d Merge pull request #3181 from VOREStation/vplk-pipelayer
Modernize the automatic pipe layer
2017-04-01 15:59:05 -05:00
Anewbe
27b1db523e Wooden circlets can now be worn as hats 2017-04-01 15:31:06 -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
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
81aec38408 Fixes a text thing 2017-03-31 19:40:40 -05:00
Anewbe
ca47d37d2f Adds a few more cosmetic flashlights 2017-03-31 18:50:00 -05:00
Anewbe
72adee8fb8 Adds a bunch of things to cargo 2017-03-31 00:23:27 -05:00
MagmaRam
34e398d328 Merge pull request #3175 from Anewbe/hands_things
Device Cell QOL
2017-03-30 20:49:24 -05:00
MagmaRam
19a9a8a413 Merge pull request #3172 from Anewbe/jumper_cables
Adds in Jumper Cables for FBP reviving
2017-03-30 19:46:26 -05:00