Datraen
3d442044d1
Adds Gene Targetting mode to Floral Somatoray
...
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.
No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
2017-05-03 13:33:58 +01:00
Anewbe
0aa55af823
Typo fix
2017-05-01 22:43:59 -05:00
Anewbe
58b9c63ec2
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-01 20:25:43 -05:00
Anewbe
3205631de3
Fixes an issue with the practice laser carbine
2017-04-30 10:26:05 -05:00
Anewbe
aaee637d30
Merge pull request #3377 from LorenLuke/PointBlankAim
...
Aim mode point blank targets on harm.
2017-04-29 10:42:22 -05:00
Kelshark
71c0531829
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/multiz/basic.dm
# config/custom_items.txt
2017-04-29 10:13:45 -04:00
Neerti
ec366d5d74
Makes Technomancer use modifiers, fixes a few bugs
2017-04-28 16:27:51 -04:00
LorenLuke
fb4a24fd38
Aim mode point blank targets on harm.
2017-04-26 11:26:31 -07:00
Anewbe
18c0b34704
Should fix the wounded accuracy gun bug
2017-04-26 11:34:00 -05:00
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
Kelshark
e1eae846f9
Merge branch 'master' of https://github.com/VOREStation/VOREStation
2017-04-18 19:29:23 -04:00
Kelshark
fb47e064d5
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# maps/RandomZLevels/labyrinth.dmm
2017-04-18 19:25:46 -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
Kelshark
8ee9f436ea
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/objects/items/weapons/tools.dm
# code/modules/mob/dead/observer/say.dm
# config/custom_items.txt
# vorestation.dme
2017-04-13 19:43:56 -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
Kelshark
4cec8849a2
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station.dm
# config/custom_items.txt
# icons/mob/widerobot_vr.dmi
2017-04-09 09:56:44 -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
Kelshark
139dbf132c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# maps/RandomZLevels/listeningpost.dmm
# vorestation.dme
2017-03-26 00:20:03 -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
Kelshark
25d81c8acf
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/admin/verbs/buildmode.dm
# code/modules/multiz/movement.dm
# code/modules/multiz/structures.dm
# code/modules/multiz/turf.dm
# config/custom_items.txt
# vorestation.dme
2017-03-10 20:34:12 -05: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
Kelshark
081e280e27
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/global.dm
# config/custom_items.txt
# icons/mob/human_races/r_xenochimera.dmi
# vorestation.dme
2017-03-03 19:17:04 -05: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
Kelshark
8df7fcd10a
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# .gitignore
# vorestation.dme
2017-02-18 09:40:18 -05:00
Arokha Sieyes
e4557b0724
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
2017-02-14 20:29:57 -05:00
