Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Atermonera
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
Heroman3003
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
Novacat
6b2c7cc29a
Update energy.dm
2019-10-21 19:54:30 -04:00
Mechoid
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
Hawk_v3
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Atermonera
93bbae11e7
Merge pull request #6475 from R1f72r/Phoronboreupgrade
...
Allows you to upgrade Phoron Bore with manipulators
2019-10-08 04:22:06 -04:00
Atermonera
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
Hawk_v3
691a1239f4
Merge from Vorestation
2019-09-29 21:53:09 +01:00
Atermonera
6e4fc794d6
Merge pull request #6467 from Heroman3003/datum-timer-beam
...
Makes every single shot not create ~40 timers but 1
2019-09-27 16:07:25 -04:00
Hawk_v3
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
FelixRuin
93cf2d41e1
fix gun handle_suicide
2019-09-21 15:01:55 +03:00
Cebutris
14d6527103
delete KHI
2019-09-14 13:17:20 -04:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
aa2a3682b9
Merge remote-tracking branch 'VOREStation/master' into medbeam
2019-08-31 15:32:22 -04:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Andrew
69ed422019
Adds Laser Tag Turrets Plus Changes ( #6324 )
...
* Adds Laser Tag Turrets
* Adds changelog
* Reverts Lethal Turrets Shooting to Kill
* Small No Longer Means Misc Life
* Revert "Merge branch 'master' into Turret"
This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.
* Revert "Revert "Merge branch 'master' into Turret""
This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.
* Github why
* Change laser.dm to master?
* Revert "Change laser.dm to master?"
This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
2019-07-27 15:45:58 -04:00
Novacat
3fcc7e1465
Merge pull request #5500 from VOREStation/upstream-merge-6285
...
[MIRROR] Adds the SLED.
2019-07-24 06:24:34 -04:00
Atermonera
f519272525
Merge pull request #6290 from Mechoid/SubMunitions
...
Adds Submunition projectiles, and a laser gun showcasing them.
2019-07-23 23:35:05 -04:00
Atermonera
a6d7c4ee81
Merge pull request #6285 from Mechoid/SLED
...
Adds the SLED.
2019-07-23 16:21:42 -04:00
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Atermonera
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
Hawk_v3
124afe1cbc
Merge remote-tracking branch 'upstream/master'
2019-07-07 18:41:28 +01:00
Anewbe
f18b82aa2b
Merge pull request #6268 from Heroman3003/targetfix
...
Fixes aiming at z-shadows breaking aiming
2019-07-06 21:34:03 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
Atermonera
3d31a77514
Multi-Tile Objects, Multi-Tile Hovershuttle
2019-07-01 20:43:53 -04:00
if there were two guys on the moon
d5f380984f
Medbeam
2019-06-29 20:04:47 +01:00
ElectricB1ue
d9ebf54db0
Adds two new alternate sprites for the detective's revolver. ( #6230 )
...
* Adds the sprites
* This should do things.
2019-06-28 21:23:42 -04:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Atermonera
f78a4e1dc8
Sif Trees and Icon Scaling
2019-05-28 13:21:39 -04:00
Hawk_v3
c2d90f5c3f
Merge remote-tracking branch 'upstream/master'
2019-05-23 22:46:42 +01:00
Mechoid
7a35723d85
Sif Animal Expansion 1
2019-05-21 19:58:19 -04:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Heroman
703c27da7e
Refactors shadekin
2019-04-28 15:10:06 +10:00
Heroman3003
e3e715454b
Makes placeholder entries for lore writing
2019-04-23 11:13:42 +10:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Neerti
f8c9664178
Explorer Update - Cataloguers
2019-03-30 16:19:24 -04:00
Novacat
1519496d9f
Merge pull request #4849 from VOREStation/upstream-merge-5978
...
[MIRROR] Unpicks some mining spaghetti
2019-03-28 22:01:36 -04:00
Unknown
3aa0fdfda5
Removes conductive flags from VR stuff
2019-03-28 21:45:38 -04:00
Neerti
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
Unknown
2dbf8499f4
Conflict Resolution
2019-03-28 21:04:21 -04:00
Anewbe
38c4b88ded
BTW I USE (FIXED) ARC
2019-03-28 20:53:50 -04:00
Novacat
716207d55d
Merge pull request #4763 from VOREStation/upstream-merge-5950
...
[MIRROR] Fixes turrets, AI shooting, and makes mob AI shooting a little smarter.
2019-03-28 20:22:52 -04:00
Unknown
9e329e2a92
Forgot something
2019-03-28 20:09:52 -04:00
Anewbe
d2e8078348
Fixes turrets, AI shooting, and makes mob AI shooting a little smarter.
2019-03-28 20:07:44 -04:00
Novacat
7a518bc619
Merge branch 'master' into upstream-merge-5944
2019-03-28 19:19:44 -04:00
Spades
a184e67c93
Changes (R&D made) Saber SMG to Advanced SMG
2019-03-28 18:22:23 -04:00
