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
Novacat and GitHub
af52f4e7c3
Merge pull request #6094 from Novacat/nova-pathfinder
...
Rarer events, more event variety
2019-11-08 13:32:45 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Mechoid and VirgoBot
e1fa847bc2
Xenowork Prep For Future ( #6491 )
...
* Xenowork, weeds walls and material blobs.
* More weeds
* XenoUpdoots
* Stop that, me.
2019-11-04 21:38:02 -05:00
Atermonera and VirgoBot
b068af1c38
Merge pull request #6502 from parasitoide/gibs4
...
Stops referencing nonexistent gib4 sprite
2019-10-29 17:25:40 -04: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
Unknown
c6d8cc4a22
Rarer events, more event variety
...
- Reduces the chances of a mundane and moderate event firing by 50%
- Reduces the chances of a major event firing by 75%
- Re-adds most Polaris events. Notables include carp, spider infestations, rogue drones, vines, and meteors.
- Grubs upped to major event
- Station-spawned spiderlings can no longer grow up to be nurse spiders.
- Fixes and re-enables the Ian storm event
2019-10-21 22:53:59 -04:00
Unknown
f1bd34846b
Properly fixes shadekin phase plummeting
2019-10-14 22:13:27 -04:00
Hawk_v3
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
Unknown
dade2aa80b
Conflict Resolution
2019-10-06 13:12:11 -04:00
Atermonera and VirgoBot
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 and VirgoBot
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
Mewchild
20ea21a7d1
Vorestation edit
2019-09-17 13:20:57 -05:00
Mewchild
2bf3fa119d
Adds step teleporters, selectively replaces admin walls to prevent falls from space
2019-09-17 02:38:59 -05: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
Unknown
bbf1fc1420
Recommended changes
2019-08-31 15:31:45 -04:00
Cameron Lennox
9f6e4df7eb
Fixed an issue where boot/shoe overlays would magically be cleaned by putting in a knife and stepping on blood.
2019-08-31 14:41:24 -04:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Andrew and VirgoBot
e4deaa6478
Combat Mechs Can Punch More Things ( #6303 )
...
* Combat Mechs Can Punch More Things
Removes the var to check for the 5 things it can attack, instead it can punch anything (but not everything will take damage).
Gives punching objects a check so you don't accidently smash something without meaning to.
Gives closets and canisters a proc to take_damage so they'll actually get smashed by the mechs.
* Take_Damage Boogaloo
* More take_damage Stuff
Adds click delay on attacking barriers.
Proper noises when attacking material doors and barricades.
More stuff can be broken by mech punch and simple mobs.
* Adds changelong
* usr to user
2019-07-24 17:00:24 -04:00
Hawk_v3
4668b23fea
Merge remote-tracking branch 'upstream/master'
2019-07-10 01:50:50 +01:00
Atermonera and VirgoBot
1472642b88
Merge pull request #6262 from Mechoid/CivilianExpansion1
...
Civilian Expansion 1: The Plantening
2019-07-07 17:29:32 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
Atermonera and VirgoBot
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
Heroman
703c27da7e
Refactors shadekin
2019-04-28 15:10:06 +10:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Heroman
141f7e649a
Fixes non-mob mobs being able to use portals
2019-04-08 20:42:59 +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
Unknown
9197cfeaeb
New Bluespace Sprites
2019-03-31 04:35:24 -04:00
Unknown
9fa575698b
Conflict Resolution
2019-03-30 20:13:49 -04:00
Neerti and VirgoBot
5967a92f02
Lynx Fixes Runtimes
2019-03-30 18:51:00 -04:00
Unknown
d7e248a09e
Might need a little help for the last two...
2019-03-29 00:12:32 -04:00
Novacat and GitHub
bada08276f
Merge branch 'master' into upstream-merge-5959
2019-03-28 20:30:41 -04:00
Unknown
d3837b76e8
Conflict Resolution
2019-03-28 19:41:16 -04:00
Anewbe and Novacat
8ed384b38c
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
Novacat and GitHub
05cc6d7df3
Update step_triggers.dm
2019-03-28 15:18:23 -04:00
Novacat and GitHub
8fcc46a6c9
Merge branch 'master' into upstream-merge-5912
2019-03-28 15:12:46 -04:00
Unknown
cf39c61c2d
Conflict Resolution
...
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Neerti and Novacat
3256202407
[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
2019-03-27 22:02:07 -04:00
Novacat and GitHub
823354433e
Merge pull request #4659 from VOREStation/upstream-merge-5796
...
[MIRROR] Adds New PoI Features + Bonus PoI
2019-03-27 13:52:46 -04:00
Novacat and GitHub
42df71908b
Merge pull request #4644 from VOREStation/upstream-merge-5803
...
[MIRROR] Guns sounds refactor and improvements
2019-03-27 12:35:26 -04:00
Neerti and Novacat
91a5203e32
Adds New PoI Features + Bonus PoI
2019-03-27 12:15:50 -04:00
Novacat and GitHub
9e00a1b164
Merge pull request #4641 from VOREStation/upstream-merge-5808
...
[MIRROR] CODERS HATE HIM: THIS TOTAL LOSER FIXES TYPOS
2019-03-27 11:22:21 -04:00
Spades and Novacat
eb0e2ec1f5
Guns sounds refactor and improvements
2019-03-27 10:42:18 -04:00
Anewbe and Novacat
09b01407e3
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
Hawk_v3