Commit Graph

501 Commits

Author SHA1 Message Date
Anewbe 42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Leshana 44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
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
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
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
Arokha Sieyes 85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -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
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
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
Yoshax 3162c723d9 Security non-lethal balance 2017-02-13 15:49:35 +00: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
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 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
killer653 832418c7c9 Polaris sync 2017-01-15 18:12:15 -05:00
Anewbe 3066d280ec Adds Neerti's proposal to the plasmastun thing 2017-01-13 16:18:05 -06:00
Anewbe 706eb0f265 Mostly ports Bay's plasma pulse stunner 2017-01-11 21:27:41 -06:00
Neerti 42807003f5 Makes halloss amount scale based on flash_strength 2017-01-05 02:30:52 -05:00
Neerti a31e65782c Make Flashes Great Again
Hand-held flashes now do 30 halloss per flash, if the person lacks flash protection.
Hand-held flashes now can be used 10 times per minute instead of five, due to needing ~4 flashes to down someone.
Flash rounds do 20 halloss if the mob hit lacks flash protection.
2017-01-04 21:45:12 -05:00
Spades 21cd4e4791 Voremob tweaks, bellies now escapable (#783)
* Voremob tweaks, bellies now escapable

Also disabled all the non-vore variants in the code to avoid confusion,
excluding aliens for now, since other stuff is handled there.

* comment removal

* Zoo.dmm hotfix

Makes the snakes play nice.

* Travis stop being a cunt

* Minor Tweak
2016-12-30 11:27:07 -05:00
killer653 0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
Cameron653 6c38e76f98 Makes disabler 1 shot stun 2016-11-28 14:18:06 -05:00
Cameron653 1b27ade2f9 Makes beam emit cyan light since cyan beam
Because cyan beam emitting white light is weird.
2016-11-19 12:27:54 -05:00
killer653 7197834863 Adds in an ERT borg 2016-11-18 22:59:47 -05:00
Anewbe be4aa63263 AP bullets 2016-11-15 19:50:28 -06:00
Anewbe 5bfc0c851e Changes the way embedding works 2016-10-11 21:29:49 -05:00
Anewbe e65b0851f3 Adds emp shotgun shells, not yet obtainable. 2016-09-25 23:52:30 -05:00
MagmaRam c73bfe021f Re-adds balance changes to heavy lasers.
They got changed by accident when I did the laser light show.
Also, adds changelogs for my last couple changes, because I'm an
    idiot and forgot them.
2016-09-18 10:47:03 -05:00
MagmaRam 22adc0411a Lasers, energy projectiles, and muzzle flashes now produce light.
It's a bit wonky due to lighting only updating once every half-second,
but it's very much functional, at least on my desktop.
2016-09-17 23:14:41 -05:00
Anewbe bbb11cfb6e Tweaks burst laser 2016-09-17 15:23:28 -05:00
Anewbe ef0b965c63 Lasercannon tweaks 2016-09-15 16:24:06 -05:00
Yoshax 98d08cbc56 Makes flash rounds respect eye protection 2016-09-12 19:10:07 +01:00
Yoshax 2d62544496 Projectile flash rounds will now do the same as a flash when hitting a target 2016-08-31 01:58:50 +01:00
Neerti 6c071290c8 Merge pull request #1983 from Anewbe/ninja_cloak+dart
Fixes some Ninja stuff
2016-06-27 01:25:47 -04:00
Datraen c391a58ab2 Merge pull request #1909 from Yoshax/heavyguns
Heavy weapons changes
2016-06-27 00:09:18 -04:00
Anewbe 17e211e200 Fixes some Ninja stuff 2016-06-26 18:20:35 -05:00
Richard D'angelo 7ab5220f64 510 Improved Overlays
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

https://github.com/Baystation12/Baystation12/commit/7c2cc890abf840b1a9967bc26c36581301e7229c
2016-06-18 15:50:10 -03:00
Yoshax 1856897894 Heavy weapons changes 2016-06-10 18:34:58 +01:00
HarpyEagle 4cf0d2bad1 Fixes many dense objects from stopping penetrating bullets 2016-06-07 19:30:21 +01:00
Spades 3b44024e88 Reverts ammo change, fixes P90 2016-06-05 17:55:39 -04:00
Spades f6497ee60d Changelog says I changed this but I didn't. 2016-06-05 13:40:37 -04:00