Commit Graph

53 Commits

Author SHA1 Message Date
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Heroman
8e26511aa1 Prevents some teleporting abuses with taur riding 2020-02-08 07:45:53 +10:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
2020-01-31 18:23:50 +01:00
Heroman
43065cb062 Changes harpoons push mode to teleport user and not everything else (pull mode unchanged) 2020-01-14 11:12:10 +10:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Heroman
3ea943f9ad Sorts vorestation-only rnd recipies 2019-09-26 18:41:54 +10:00
Unknown
74f363abf8 Typeo in NSCW description, fixes its load out too
> interchangable to interchangeable.
> Re-adds secondary cell bank, adds one lethal ammo type to balance the non-lethal and lethal ammo again, since recent changes bumped the cell bank capacity from 3 to 4.
2019-09-25 14:34:13 +01:00
Hawk_v3
7f0746e44c Clearing out some more.
NSFW is now the NSCW and the ML-3M is the ML-3.

Also, no, fluff items with TELEPORTERS are no bueno.
2019-09-23 21:40:26 +01:00
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Heroman3003
6e989be5b7 Adds proper tech levels to ML3M and its magazines 2019-09-17 12:04:31 +10:00
Heroman3003
ebe667c4d2 Adds combat hybrid cell-loaded gun kit 2019-09-17 11:53:13 +10:00
Heroman3003
cedb2ddcf9 Adds extra stun cell to HoS kit 2019-09-17 11:29:40 +10:00
Heroman3003
caf274951c Implements ML-3M, Adds prototype NSFW 2019-09-17 11:24:58 +10:00
Heroman
cfb53d3c46 Refactors and rebalances NSFW and ML3M stuff 2019-09-17 07:12:26 +10:00
Hawk-v3
b7a433f914 Merge branch 'master' into space-fox-genocide 2019-09-16 02:34:22 +01:00
Cebutris
6db6d6f0c7 deletes more KHI, reworks some wording and other corps 2019-09-14 15:13:11 -04:00
Cebutris
fd8d450258 more KHI delete 2019-09-14 13:34:23 -04:00
Cebutris
23a8a98909 delete mispelling 2019-09-14 13:31:38 -04:00
Cebutris
4346225077 delete more khi 2019-09-14 13:30:32 -04:00
Cebutris
14d6527103 delete KHI 2019-09-14 13:17:20 -04:00
Unknown
a94aaac8fb More tweaks 2019-09-09 23:37:41 -04:00
if there were two guys on the moon
62b14805d5 adds ml3m to closets and stuff 2019-07-27 16:16:10 +01:00
if there were two guys on the moon
163ac56503 sprites and map fix 2019-07-22 23:20:00 +01:00
if there were two guys on the moon
d803b557fd ML3M 2019-07-19 08:32:24 +01:00
Heroman3003
e3e715454b Makes placeholder entries for lore writing 2019-04-23 11:13:42 +10:00
Heroman3003
d4d08be880 Fixes harpoon targeting obstructed tiles 2019-04-17 09:11:59 +10:00
Heroman
148511e6b0 Fixes some issues with BSH 2019-04-08 16:34:36 +10:00
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Unknown
cf39c61c2d Conflict Resolution
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Unknown
976aec2f71 Sorts out this PR 2019-03-26 21:43:56 -04:00
Unknown
a4317b1910 [5654] Makes this PR Compile
This one made me cry.
2019-02-23 12:30:16 -05:00
Spades
a542e23e4e dragor no 2018-11-25 20:32:40 -05:00
pontifexminimus2
5913203c0f Due to request of Ace. 2018-11-25 17:22:35 +01:00
pontifexminimus2
4c46defd4f Renaming Protector too. 2018-11-25 16:50:24 +01:00
pontifexminimus2
784e48b895 Holy shit I hate this. 2018-11-25 16:45:37 +01:00
Verkister
03ab2fef08 Updates sickshot description.
Also making it little more clear that the only way to get victims out of uncooperative or dead things is no longer live human exclusive.
2018-04-16 10:48:25 +03:00
JOAN-RIG\Joan Risu
f5e2039dd5 removed invalid if statement from gunbuster. 2018-03-09 23:37:52 -08:00
JOAN-RIG\Joan Risu
b8708a6a0e removed a line from the gun saber 2018-03-02 23:53:15 -08:00
JOAN-RIG\Joan Risu
1420df0db1 Moves crescent rose to its own file, added a new gun for the nerd, and updated the Dominator to be alert level compliant. 2018-03-02 23:43:40 -08:00
Arokha Sieyes
f04c58f202 VS: Rewrites basically all of how bellies work
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
Leshana
fef30da831 Upgrades NSFW to use initialize() and SSoverlays
- Both as a first demonstration and as a practical bugfix, we upgrade the NSFW to use SSoverlay.   Instead of building a mutable_apperance and assigning it, we cut_overlays(), make our images, and call add_overlay() to queue it for compiling.
- We also must convert from using New() to initialize() becuase for annoying BYOND reasons,  some static variables in SSoverlays are not always instantiated before mapload.  So its important not to call overlays functions from New()  (We shouldn't be doing that ANYWAY for performance reasons, but now its even more true)
2018-02-24 18:33:53 -05:00
Arokha Sieyes
d68629fc80 VS: MA override removal changes 2018-02-24 11:44:57 -05:00
Arokha Sieyes
2dffd17c39 Fix #3010 2018-02-15 02:46:11 -06:00
Arokha Sieyes
5b1311c994 Fix NSFW and fluff item removal
Fixes the NSFW sprite buggyness.

Removes Briana's gun spawn. She gave her gun up ICly!
2018-02-03 21:58:41 -05:00
Leshana
ca880019e8 Refactor NSFW gun code to be robust against bad data conditions. 2018-01-08 22:43:57 -05:00
Arokha Sieyes
5c6637cffa Gives the HoS a KHI-102b NSFW
It's just my fluff gun. But sharing is caring.

From the ingame fluff:
"Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of energy beams can be configured at once. Ammo not included."
"This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
"The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."

The HoS's includes 2 lethal, 2 stun, 1 net, and 1 ion battery. There are other batteries (like instagib!) but there's no way to get them normally. There's also one that strips people.
2018-01-04 23:57:11 -05:00
Cyantime
ad4f15e216 It's not a spawn class idiot 2017-10-01 14:47:47 -04:00
Cyantime
4046b90854 Limits bluespace harpoon teleportation range. 2017-10-01 14:38:44 -04:00
killer653
4fcbbe40f1 Size changes. 2017-07-28 06:43:44 -04:00
Arokha Sieyes
bd39011ab4 NSFW Gun
Also fixes slidey walls at centcom, gives the ERT commander a NSFW with stun, xray, lethal, and net. Gives deathsquad a full NSFW kit (including 'final option' ammo), replaces my own fluff Hunter with a NSFW with stun and net (so, same as the hunter, but that sprite is so badass I can't help it), and fixes a typo on my permit while I'm on there (KIN isn't a thing, KHI is).
2017-06-17 15:44:52 -04:00