Chompstation Bot
55e3dc7904
Port current /tg/ lighting system
2021-06-18 04:23:09 +00:00
Aronai Sieyes and Chompstation Bot
4edcaa7908
Merge pull request #10611 from VOREStation/upstream-merge-8123
...
[MIRROR] stops armour plate and armour plate inserts having the same name, and…
2021-06-11 19:22:01 +00:00
Chompstation Bot
20e3b0a2d3
[MIRROR] Linter Introduction + Cleanup
2021-05-27 16:31:50 +00:00
Chompstation Bot
55cb88b4a9
[MIRROR] Ported the Bay/Nebula emote system.
2021-05-05 18:45:31 +00:00
Nadyr and GitHub
e98859942f
Merge branch 'master' into upstream-merge-9974
2021-03-26 03:57:31 -04:00
Chompstation Bot and Darlantan
2a5c21c8f5
[MIRROR] Kaleidoscope 2: The Retabbening
2021-03-21 01:24:14 -04:00
Chompstation Bot
2915e36ee8
[MIRROR] Tachikoma tweaks.
2021-03-19 09:44:42 +00:00
Chompstation Bot
598a7814e8
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
2021-03-09 20:17:06 +00:00
Chompstation Bot
ad57e1ad13
[MIRROR] Sideports a couple of init unit tests from Neb.
2021-02-27 18:45:36 +00:00
Novacat and Chompstation Bot
9e5a5c4c46
Merge pull request #9738 from VOREStation/twologfix
...
Two fixes for messages I noticed in logs
2021-02-17 15:40:52 +00:00
Novacat and Chompstation Bot
5211edc9c0
Merge pull request #9573 from VOREStation/upstream-merge-7786
...
[MIRROR] Gadgets & Gizmos
2021-01-24 06:55:05 +00:00
Sharkmare
69d2fa3387
Fixing typo
2021-01-09 01:35:46 +01:00
Sharkmare
0e22771046
Fixing WHIP
...
Adds placeholder whip sprite for the whip, since virgo doesnt have it, we dont have it and by god im not looking for if it even existed or when.
2021-01-09 01:27:52 +01:00
Novacat and Chompstation Bot
7e16cd134a
Merge pull request #9527 from VOREStation/upstream-merge-7780
...
[MIRROR] Adds a Whip.
2020-12-28 17:12:39 +00:00
Razgriz
f0ace37d4f
Spear and Gun sizes
...
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)
-Tweaked the Floragun have no recoil for micros.
2020-11-23 19:29:48 -07:00
Verkister and Chompstation Bot
16a23eadec
Merge pull request #9235 from VOREStation/upstream-merge-7726
...
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-19 10:37:24 +00:00
Cadyn
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
Razgriz
f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Repede
1e4e534b9e
Chainsaws - replaced New with Initialize so chainsaws can be mapped in
2020-08-05 20:15:04 -04:00
izac112
601a155b30
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-07-25 15:22:42 +02:00
Cerebulon and VirgoBot
8b031dd8ad
Persistent Trash/Dirt/Graffiti/Notices
2020-07-24 05:24:56 -04:00
Razgriz
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
izac112
e807b80281
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-05-27 20:10:55 +02:00
KasparoVy
1a5bdf4e98
Refactors Ore Eating to Allow the Consumption of Material Sheets
...
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.
Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
izac112
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
izac112
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
Aronai Sieyes and VirgoBot
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
Aronai Sieyes
88154f0374
Adds rutile (titanium ore) and other materials
2020-04-20 12:07:45 -04:00
Erik
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
Repede
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
Atermonera and VirgoBot
f4fb9ac262
Merge pull request #6885 from TheFurryFeline/TFF-Message_Fixy_For_Snowballs_and_Kickstands
...
[Feature Tweak] Message Fixy For Snowballs/Kickstands
2020-03-25 18:47:34 -04:00
Atermonera and VirgoBot
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
Repede
c45d7c2196
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/modules/events/event_container_vr.dm
# icons/misc/title_vr.dmi
# interface/skin.dmf
# vorestation.dme
2020-03-01 12:35:52 -05:00
Aronai Sieyes
f475ecbdc6
Replace a bunch of VOREStation edits that can be sent to Polaris
2020-02-29 19:45:58 -05:00
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
Atermonera and VirgoBot
11eed81b92
Ports precision placement of items
2020-02-22 02:35:41 -05:00
Erik
11268a3ff4
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge
2020-02-13 20:36:32 -08:00
Arokha Sieyes and Leshana
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
lbnesquik
e0fcf47373
Add a craftable, two-handed sledgehammer.
...
- Can be made out of plasteel, rods and metal.
- Relatively high damage but less than the fireaxe.
- Special sound.
2020-01-21 13:48:28 +01:00
Cebutris
3450336020
does the thing, and another thing
2020-01-20 13:44:02 -05:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Mechoid and VirgoBot
ec5e851399
Xenoflora expansion take2
2020-01-08 13:46:25 -05:00
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
lbnesquik
562df07602
Move the lance sprite to weapons_vr.dmi.
2019-12-26 07:25:49 +01:00
Chompstation Bot