Hawk_v3
0973c49633
Merge remote-tracking branch 'upstream/master'
2019-08-27 00:22:31 +01:00
Heroman
af94e7f374
Fixes some mimic bugs
2019-08-26 10:29:41 +10:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
Hawk_v3
96b8a7ab95
Merge remote-tracking branch 'upstream/master'
2019-08-17 21:06:48 +01:00
Michiyamenotehifunana
81c56fefd8
Makes Cargo Tugs Great Again (and a minor tweak)
2019-08-16 12:37:08 +08:00
Michiyamenotehifunana
6c8589fa4a
Whoops I missed a bit
2019-08-15 22:45:30 +08:00
Michiyamenotehifunana
3a676ad02e
Adds Toricrates and stuff
2019-08-15 22:22:28 +08:00
Atermonera
c9e9932182
Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange
...
Freebie Orange Jumpsuit
2019-08-12 14:40:23 -04:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Novacat
d844f233c4
Merge pull request #5508 from VOREStation/upstream-merge-6279
...
[MIRROR] Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
2019-07-30 19:50:02 -04:00
Heroman
54be18505b
Removes the leaks and related mechanics
2019-07-31 09:25:07 +10:00
Andrew
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
Mechoid
5864447d5d
Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my. ( #6279 )
...
* Pipe Clamps, Shutoff Valves, and Leaking Tubes, oh my.
* Fix processing fuckery.
* Deal with Forever-Seals, and Infini-clamps.
* Update clamp.dm
2019-07-24 04:46:28 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
Heroman
2965503cbd
Adds new GPSs
2019-07-02 12:04:17 +10:00
mistyLuminescence
711e807d32
tinytweaks
2019-06-21 17:07:51 -04:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Neerti
3f7d2a0450
Fixes fireaxe cabinets
2019-04-16 22:00:42 -04:00
RadiantFlash7
1330ad2a07
Fixing broken code from merge\
...
Fixing missing map animals and missing icon files.
2019-04-14 15:37:22 -04:00
Hawk_v3
8d868fb890
Merge branch 'map' into RadiantMaster
2019-04-14 18:27:05 +01:00
RadiantFlash7
025c358c84
Merge remote-tracking branch 'Repede/master'
2019-04-12 19:54:17 -04:00
RadiantFlash7
fd32189505
Major Map overhaul
...
Cargo finalized
Security rework #5 Done.
Maintence fleshed out,
...Security reword #6 started,
Escape hall added in progress,
added centcom z level for transit arrival/departure shuttles along with centcom.
Copied tether.dm files over to /yw map folder for proper custom map compiling. (required for planets to function)
Recoded Planetary atmos to use O2, Super cold O2, and weather to be harsher.
Added a buncha areas to differant mapping z levels, still a lot more to go.
New titlescreen for our server by an artist.
2019-04-12 19:11:48 -04: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
0482da8c52
Ports two polaris bugfix PRs early
2019-04-06 12:21:24 -04:00
Unknown
7ecddb11de
Service Keys Too
2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1
Command key box
2019-04-03 15:11:06 -04:00
Heroman
9b56460487
Fixes a typo
2019-04-02 17:57:30 +10:00
Heroman3003
eebd7c64a9
Fixes passive and mostly passive mobs blocking the way all the time
2019-04-02 09:27:24 +10:00
Novacat
9fd697e007
Merge pull request #4873 from VOREStation/upstream-merge-5997
...
[MIRROR] Beakers for Botany
2019-03-28 22:02:37 -04:00
Novacat
e2afa12e38
Merge pull request #4841 from VOREStation/upstream-merge-5992
...
[MIRROR] Departmental Turtlenecks
2019-03-28 22:00:31 -04:00
Anewbe
8ed384b38c
Rewrites Atmospherics
2019-03-28 19:25:11 -04:00
elgeonmb
9d056decda
Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 16:54:32 -04:00
Neerti
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
Anewbe
ac34c4b763
Stasis bags don't murder patients
2019-03-27 19:18:13 -04:00
Novacat
1bbb64494e
Merge pull request #4678 from VOREStation/upstream-merge-5835
...
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
2019-03-27 15:19:15 -04:00
Neerti
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Unknown
976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
Atermonera
b4db45e1ea
Merge pull request #5997 from mistyLuminescence/plantbeakers
...
Beakers for Botany
2019-03-26 17:17:01 -04:00
Atermonera
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
Atermonera
bf7686cd02
Merge pull request #5992 from mistyLuminescence/turtlenecks
...
Departmental Turtlenecks
2019-03-08 01:45:09 -05:00
Spades
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
Sebbe9123
420803122b
re-fixes this file since it wasn't obvious I was a brainlet before.
2019-02-20 23:50:07 +01:00
Sebbe9123
b6b4980ea8
Fixes largecrates for real, i'm a fucking brainlet.
2019-02-18 10:46:07 +01:00
Sebbe9123
c0e0afe919
Fixes most crates in largecrave_vr. Oties still broke.
2019-02-18 10:25:28 +01:00
Neerti
e1cf31c565
Merge pull request #5835 from Cerebulon/ReligionUpdate
...
Updates Religion Lists + Adds Religious Paraphernalia
2019-01-14 03:47:00 -05:00
Cameron653
9dd973221d
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
kevinz000
fc178c1e04
Makes math helpers defines for performance
2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Hawk_v3
30d6ee7801
Merge remote-tracking branch 'upstream/master' into updates
2018-11-01 23:15:58 +00:00
Neerti
68d1d5cce9
Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature
...
Remplace the plant clippers with a pair hedgetrimmers
2018-10-30 18:37:45 -04:00
