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 and GitHub
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 and GitHub
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 and GitHub
b4c0d6f7b5
Merge pull request #946 from Screemonster/particleguns
...
adds a zero-pressure gun for mining
2017-02-14 19:17:06 -05:00
Anewbe and GitHub
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 and GitHub
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
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 and GitHub
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
ForFoxSake
3e0af860e9
Makes the shotgun go off if it's modified while loaded.
2016-12-09 13:22:04 +00:00
Cameron653 and GitHub
6c38e76f98
Makes disabler 1 shot stun
2016-11-28 14:18:06 -05:00
MagmaRam
82e2d67067
Changes the formatting for attack logs for reflex shots.
2016-11-23 19:22:38 -06:00
Cameron653 and GitHub
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