Commit Graph

1036 Commits

Author SHA1 Message Date
Arokha Sieyes
055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Anewbe
a4d9db202b Allows ion pistol on the belt. 2017-04-21 19:24:06 -05:00
Anewbe
e17eccae93 Adds ion pistol to uplink, allows holstering 2017-04-20 20:04:21 -05:00
Anewbe
d7b347c4c9 Merge pull request #3333 from Neerti/4/18/2017_modifier_system_and_lings
Adds Modifier System, Changes Some Ling Stuff
2017-04-19 13:29:21 -05:00
Neerti
4378fc0812 Merge pull request #3295 from Anewbe/lever_action
Adds a lever-action rifle
2017-04-19 13:58:37 -04: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
2306d3726e Merge pull request #3325 from LorenLuke/Silenced-Notification
Silenced Weapons tell firer when fired
2017-04-19 10:30:30 -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
LorenLuke
1f0264f68b Adds range/small message to notification. 2017-04-17 19:41:17 -07:00
LorenLuke
c28d8738aa Silenced Weapons tell firer when fired. 2017-04-17 10:34:40 -07:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
2017-04-15 23:14:32 -05:00
Neerti
d9bd49aae4 Aiming at someone is now logged 2017-04-14 03:40:03 -04:00
Anewbe
2e3bd1f6d9 Adds a lever-action rifle 2017-04-13 15:36:37 -05:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Anewbe
5dfc85e629 Merge pull request #3226 from Yoshax/lemat
Adds a LeMat Revolver
2017-04-05 13:32:16 -05:00
Yoshax
530a2b5c60 Adds a LeMath Revolver 2017-04-05 14:29:24 +01:00
Arokha Sieyes
85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
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
bfb3871ec3 Adds hollowpoint rounds, for bears and such 2017-04-03 18:27:19 -05:00
Arokha Sieyes
cdf9fd476c Adds the 'Hunter' Capture Gun
Dual mode stun-beam and net launcher, craftable in R&D. Would be legal for security to have on green since it's non-lethal. The stun beam has 10 shots like the taser, and the net launcher has 2 (uses the same energy). So basically 5 stun+1 net, or 2 nets, or 10 stuns.

Uses a new overlay system for updating it's icon rather than the "have one state for every possible combination" to prevent a huge mess of iconstates. Maybe Joan could look at this and use it sometime.
2017-04-02 19:25:27 -04:00
Anewbe
88b22cd5da Tweaks the Vox weapons 2017-04-01 22:41:46 -05:00
Leshana
6eee55c983 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	code/modules/client/preference_setup/general/03_body.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	html/changelogs/.all_changelog.yml
#	icons/mob/human_races/markings.dmi
#	vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
c9bfabd426 Device Cell QOL 2017-03-29 13:58:35 -05:00
Arokha Sieyes
9edf3a6629 Polaris Merge Sync 2017-03-26 20:12:34 -04:00
Anewbe
3c1d897fc4 Actually gets the HI name right 2017-03-24 15:27:55 -05:00
Leshana
f0270451a7 Added vore capabilies to the new simple_animal system.
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype.  Instead we simply enable vore on the main type.  Consensus being we don't need a type for non-vore versions of stuff.
  * This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values.  In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Arokha Sieyes
805b473976 Polaris Sync Merge
Fixed Polaris merge conflicts
* Space controller merge conflict
2017-03-18 00:58:12 -04:00
Screemonster
87f940293a adds particle guns to science and cargo 2017-03-09 18:10:26 +00:00
Anewbe
19710d9bd8 Reworks empulse and emp_act 2017-03-05 12:22:45 -06:00
Arokha Sieyes
387f429e5e Merge large polaris changes 2017-03-02 22:44:17 -05:00
Anewbe
d1e7c37a8c Tasers can hurt simple mobs 2017-02-23 18:24:13 -06:00
Screemonster
e55fc09540 adds more particle guns and icon fixes 2017-02-22 10:59:34 +00:00
Arokha Sieyes
e4557b0724 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 2017-02-14 20:29:57 -05:00
Arokha Sieyes
b4c0d6f7b5 Merge pull request #946 from Screemonster/particleguns
adds a zero-pressure gun for mining
2017-02-14 19:17:06 -05:00
Anewbe
fae79a7f80 Merge pull request #2996 from MagmaRam/gunshow
Lock-on changes
2017-02-14 17:00:28 -06:00
Yoshax
3162c723d9 Security non-lethal balance 2017-02-13 15:49:35 +00:00
Screemonster
a6b00c8870 adds a zero-pressure gun for mining 2017-02-13 03:48:24 +00:00
MagmaRam
db5e832e28 Lock-on time is now 2.5 seconds. 2017-02-11 20:05:22 -06:00
MagmaRam
19af747e4e Adjusts targeting/hostage-taking to have a proper delay before shooting 2017-02-06 11:02:22 -06:00
Anewbe
cad668a72a Further tweaks to Vox and their toys 2017-02-01 21:43:21 -06:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Anewbe
1973a5193a Fixes some things with Vox 2017-01-28 16:03:12 -06:00
Anewbe
a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Anewbe
3d20774a41 Fixes a few more Vox Toy things 2017-01-26 16:25:28 -06:00
Dhaeleena
63bced3531 Properly Done the .357 flash rounds 2017-01-26 15:53:43 -03:00
Dhaeleena
2fef35d980 Lots of changes and Fluff fixes 2017-01-26 11:48:22 -03:00
Anewbe
6816af4485 More toys kikiki 2017-01-25 22:20:52 -06:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
27ea27964e Adds and tweaks Vox toys 2017-01-19 21:28:51 -06:00
Anewbe
c2ac804dc0 Implements the vacuum traversal part of the plasmastun 2017-01-15 17:42:05 -06:00