Commit Graph

7216 Commits

Author SHA1 Message Date
Neerti
baac0efffb Merge pull request #3266 from Anewbe/scratch_damage
Armor soak now caps at 80% of incoming damage
2017-04-19 23:33:30 -04:00
Anewbe
28caa29467 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scratch_damage
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
2017-04-19 12:55:11 -05:00
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
bf7dce79cc Unathi mechanical changes (#3256)
* Unathi changes

* Tweaks blurb

* Alcohol tweaks

* Age tweak

* Slowdown

* Adds Unathi to the codex

* Fixes Unathi Organs, adds sprites

* Fixed the changelog

* Sprite and language tweaks, Unathi
2017-04-19 13:42:51 -04:00
Anewbe
93b52c138a Merge pull request #3308 from LorenLuke/Changeling-Respec
Tweaks Changeling Respecs
2017-04-19 10:32:13 -05: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
b00897fb15 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into scratch_damage 2017-04-17 16:49:10 -05:00
MagmaRam
cff6fc4150 Merge pull request #3313 from Anewbe/halt_fix
Sorta fixes the syntax on the *halt emote
2017-04-17 11:26:46 -05:00
Neerti
d09cc7a57d Merge pull request #3306 from Anewbe/markings
Makes two more markings Taj only
2017-04-16 10:26:16 -04:00
Neerti
c91d8cc767 Merge pull request #3273 from LorenLuke/Numpad
Allows usage of ctrl+numpad for target zone selecting.
2017-04-16 00:40:15 -04:00
Anewbe
1fbef2de5b Merge pull request #3286 from VOREStation/smooth-lighting
Port tg/paradise/goon soft-edge lighting
2017-04-15 22:52:42 -05:00
Anewbe
f4444f2dad Sorta fixes the syntax on the *halt emote 2017-04-15 20:35:17 -05:00
LorenLuke
ca378b7b69 Tweaks Changeling Respecs. 2017-04-15 01:57:49 -07:00
Anewbe
29eb4f5425 Makes two more markings Taj only 2017-04-14 23:25:46 -05:00
Neerti
953574a57d Merge pull request #3303 from Anewbe/doona_faces
Diona should regrow faces now
2017-04-15 00:21:33 -04:00
Anewbe
4cf38d9037 Should fix throwing people. 2017-04-13 23:38:16 -05:00
Anewbe
25ea0ed33d Diona should regrow faces now 2017-04-13 22:48:10 -05:00
LorenLuke
452f1fad9b Merge branch 'master' into Grab-Throw-Fix 2017-04-13 19:29:40 -07:00
LorenLuke
a0eecc9f45 Fixes grabs not being able to throw (sorry... :c ) 2017-04-13 19:28:10 -07:00
Leshana
f2956464b8 Replace direct access of lighting overlays with T.get_lumcount() 2017-04-12 19:11:53 -04:00
Anewbe
077fa19920 Merge pull request #3285 from Anewbe/aviator_fix
Fixes aviator SecHUDS
2017-04-12 16:52:46 -05:00
Cerebulon
18de8caf6a Adds two side swept versions of the Undercut haircut
Also removes a couple of unnecessary comments from the file.
2017-04-12 21:13:59 +01:00
Anewbe
60fa2839e7 Fixes aviator SecHUDS 2017-04-11 21:20:48 -05:00
Anewbe
03c0ebf490 Lessens brainloss from oxyloss 2017-04-11 20:42:17 -05:00
LorenLuke
faf85774b5 Resisting out of choking grabs isn't 100% guaranteed anymore. Tweaked some ling checks to compensate. 2017-04-11 01:16:03 -07:00
LorenLuke
69a8d84344 Fixes a few errors. 2017-04-11 00:39:21 -07:00
LorenLuke
cebbac32e8 Allows usage of ctrl+numpad for target zone selecting. 2017-04-11 00:25:29 -07:00
Anewbe
ab4f99a79e Armor soak now caps at 80% of incoming damage 2017-04-10 20:09:59 -05:00
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