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
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
Kelshark
9ce88c8c6c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/silicon/robot/robot_modules.dm
# config/custom_items.txt
# icons/obj/gun.dmi
# maps/virgo-1.dmm
# vorestation.dme
2017-02-03 21:35:22 -05: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
Kelshark
c57914a426
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/admin/verbs/adminhelp.dm
# maps/virgo-1.dmm
2017-01-21 01:42:11 -05: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
Kelshark
4dadfd2483
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
# maps/virgo-1.dmm
# maps/virgo-2.dmm
2017-01-04 14:05:08 -05:00
Kelshark
b269f6fd19
MG42-E and dogborgs now got more modules (crowbar+pounce) and stuff
2017-01-04 14:04:13 -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
Kelshark
cecabf1f8f
wolfbrigade m8
...
also stash fixes
2016-12-28 21:06:34 -05:00
Kelshark
a32459eb90
Gorillas back in bb
2016-12-28 17:29:25 -05:00
Kelshark
5c967fc7e8
MG42 m8
2016-12-27 19:49:37 -05:00
izac112
fd1033e6e1
p
2016-12-18 04:13:47 +01:00
izac112
8cad7d3927
Here we go
2016-12-18 03:13:37 +01:00
Kelshark
26ce56cda9
guns and other things
2016-12-17 14:09:44 -05:00
Kelshark
5473eae975
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# .gitignore
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
2016-12-11 13:41:38 -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
Kelshark
536e40ffde
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
# config/custom_items.txt
2016-12-07 12:22:48 -05:00
Cameron653
6c38e76f98
Makes disabler 1 shot stun
2016-11-28 14:18:06 -05:00
Kelshark
e3577ae1a5
Nerfed hyperzine, added more languages to borgs understanding, boosted the ERT borg's gun, added new dogborg, fixed xenomaid borg so it is selectable, other..
2016-11-27 17:33:53 -05:00
MagmaRam
82e2d67067
Changes the formatting for attack logs for reflex shots.
2016-11-23 19:22:38 -06: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
Arokha Sieyes
92833e335c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
...
COMMENT FROM ARO: I have no idea why these files conflicted. I took the versions at their most recent commit for almost all of them (except the ones with actual merge conflict issues). Almost all the files were identical, including whitespace. Hopefully 'using theirs' will resolve this.
# Conflicts:
# code/datums/uplink/ammunition.dm
# code/game/gamemodes/technomancer/spells/aura/fire_aura.dm
# code/game/gamemodes/technomancer/spells/aura/frost_aura.dm
# code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
# code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
# code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
# code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
# code/game/gamemodes/technomancer/spells/projectile/chain_lightning.dm
# code/game/gamemodes/technomancer/spells/projectile/overload.dm
# code/game/gamemodes/technomancer/spells/projectile/projectile.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/science.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/flashlight.dm
# code/game/objects/items/weapons/power_cells.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/client/preference_setup/loadout/loadout_shoes.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/clothing/spacesuits/void/station.dm
# code/modules/integrated_electronics/assemblies.dm
# code/modules/integrated_electronics/input_output.dm
# code/modules/integrated_electronics/tools.dm
# code/modules/mob/living/carbon/carbon_defense.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/organs/blood.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/dnalocking.dm
# code/modules/projectiles/effects.dm
# code/modules/projectiles/guns/energy.dm
# code/modules/projectiles/guns/energy/laser.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/research/designs.dm
# html/changelogs/.all_changelog.yml
# html/changelogs/Anewbe - Beret.yml
# html/changelogs/Anewbe - Tape Roll.yml
# html/changelogs/MagmaRam-PR-2631.yml
# html/changelogs/Redstryker - EMTVoidsuits.yml
# icons/mob/head.dmi
# icons/mob/items/lefthand_hats.dmi
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_hats.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/skrell/helmet.dmi
# icons/mob/species/skrell/suit.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/mob/species/tajaran/suit.dmi
# icons/mob/species/unathi/helmet.dmi
# icons/mob/species/unathi/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/species/seromi/hats.dmi
# icons/obj/clothing/species/seromi/suits.dmi
# icons/obj/clothing/species/skrell/hats.dmi
# icons/obj/clothing/species/skrell/suits.dmi
# icons/obj/clothing/species/tajaran/hats.dmi
# icons/obj/clothing/species/tajaran/suits.dmi
# icons/obj/clothing/species/unathi/hats.dmi
# icons/obj/clothing/species/unathi/suits.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/power.dmi
# maps/RandomZLevels/stationCollision.dm
# maps/polaris-1.dmm
# maps/polaris-2.dmm
2016-10-20 21:24:07 -04:00
Anewbe
5bfc0c851e
Changes the way embedding works
2016-10-11 21:29:49 -05:00
Spades
570c2474c3
Fixes w_class of items to be consistent with Polaris update ( #636 )
...
* Fixes w_class of items to be consistent with Polaris update
* Typo
2016-10-09 19:23:10 -04:00
Eearslya Sleiarion
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
Anewbe
771d8b9e4b
Adds a smaller device cell for use in non-weapon devices
2016-10-08 15:34:18 -05:00
