Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Sebbe
1cf7fa2d69
Merge branch 'master' into mobpathfix
2019-04-16 11:39:01 +02:00
Sebbe
224ce6582b
Hopefully fixes every path
...
plz game, I didn't have fun ;w;
2019-04-16 10:41:04 +02:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Novacat
466516b066
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
2019-04-08 15:24:27 -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
Heroman
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
Unknown
ec19a66eff
Conflict Resolution
2019-03-27 16:36:41 -04:00
Unknown
976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
Sebbe9123
ad35326865
Un-edits and fixes mobpaths.
2019-02-18 11:34:12 +01:00
Cameron653
9dd973221d
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
Hawk_v3
beb7579ed3
Vore Updates and merges
2018-10-03 18:25:39 +01:00
Arokha Sieyes
b099ac6e4c
Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018
...
# Conflicts:
# code/__defines/holomap.dm
# code/__defines/mobs.dm
# code/_helpers/icons.dm
# code/_helpers/unsorted.dm
# code/_onclick/hud/hud.dm
# code/_onclick/item_attack.dm
# code/controllers/Processes/supply.dm
# code/controllers/subsystems/planets.dm
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/science.dm
# code/datums/supplypacks/security.dm
# code/datums/supplypacks/supply.dm
# code/game/area/Space Station 13 areas.dm
# code/game/atoms_movable.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/jukebox.dm
# code/game/machinery/recharger.dm
# code/game/machinery/vending.dm
# code/game/mecha/equipment/tools/medical_tools.dm
# code/game/mecha/equipment/weapons/weapons.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/megaphone.dm
# code/game/objects/items/poi_items.dm
# code/game/objects/items/weapons/implants/implantlanguage.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/objects/structures/flora/trees.dm
# code/game/objects/structures/plasticflaps.dm
# code/game/supplyshuttle.dm
# code/game/turfs/simulated/wall_attacks.dm
# code/modules/admin/admin_verbs.dm
# code/modules/assembly/infrared.dm
# code/modules/client/client procs.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/client/preferences.dm
# code/modules/clothing/suits/miscellaneous.dm
# code/modules/holomap/holomap_datum.dm
# code/modules/holomap/station_holomap.dm
# code/modules/integrated_electronics/core/printer.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/death.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/robot.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob_movement.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/subtypes/standard.dm
# code/modules/planet/weather.dm
# code/modules/power/cable.dm
# code/modules/power/fusion/core/core_control.dm
# code/modules/power/fusion/fuel_assembly/fuel_control.dm
# code/modules/power/fusion/gyrotron/gyrotron_control.dm
# code/modules/projectiles/gun.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# config/names/first_name_skrell.txt
# config/names/last_name_skrell.txt
# icons/mob/head.dmi
# icons/mob/robots.dmi
# icons/mob/species/tajaran/helmet.dmi
# icons/obj/ammo.dmi
# icons/obj/gun.dmi
# icons/obj/mining.dmi
# icons/obj/projectiles.dmi
# icons/obj/rig_modules.dmi
# icons/obj/surgery.dmi
# icons/turf/walls.dmi
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-8.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
# maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
# maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
# maps/submaps/surface_submaps/mountains/deadspy.dmm
# maps/submaps/surface_submaps/mountains/mountains_areas.dm
# maps/submaps/surface_submaps/plains/Thiefc.dmm
# maps/~map_system/maps.dm
# vorestation.dme
2018-09-27 18:01:09 -04:00
Kelshark
aea1eee615
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# config/custom_items.txt
2018-02-21 22:19:24 -05:00
Leshana
a8c7c520bb
VOREStation updates related to merged changes from polaris.
2018-02-07 20:08:10 -05:00
Leshana
38f20304ca
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
Kelshark
8ee9f436ea
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/objects/items/weapons/tools.dm
# code/modules/mob/dead/observer/say.dm
# config/custom_items.txt
# vorestation.dme
2017-04-13 19:43:56 -04:00
Arokha Sieyes
52cb568004
Rogueminer Improvements
...
Shuttle is always vacuum, no airlock cycling now, and belter mobs won't fight each other, only you.
2017-04-04 15:20:45 -04:00
Kelshark
139dbf132c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# maps/RandomZLevels/listeningpost.dmm
# vorestation.dme
2017-03-26 00:20:03 -04:00
Leshana
f0270451a7
Added vore capabilies to the new simple_animal system.
...
* Added happy friend time mechanics working properly for fox and cat.
* Added vore mechanics and vore overrides
* No longer enable vore on simple animals by creating a "/vore" subtype. Instead we simply enable vore on the main type. Consensus being we don't need a type for non-vore versions of stuff.
* This allowed us to revert many path references throughout the codebase to the original non-vorestation back to their original values. In these cases the "Vorestation Edit" comment is removed.
* Moved the vore overrides for upstream simple animals into its own file zz_vore_overrides.dm
2017-03-22 19:32:19 -04:00
Kelshark
ea669886d0
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/language/station_vr.dm
# code/modules/surgery/robotics.dm
# config/custom_items.txt
2017-03-17 19:28:02 -04:00
Yoshax
d98fcfcc14
Adds pike, weak pike and strong carp, also adds them to the belt mining lists
2017-03-11 02:40:18 +00:00
Kelshark
994c6417a4
humvee sprite bug edit, fixed z, added rewards to mining reward, changed voting sound
2017-02-19 12:10:27 -05:00
Arokha Sieyes
8f417de9a3
This was always the only commit.
2017-02-17 00:56:53 -05:00
Arokha Sieyes
e60eb8464e
Additional mining tweaks on zone handling
...
Keep 2 zones clean instead of 1
Give 10 points for free, for progressing zones
Always score zones unless already scored, if asked to
Space geese are SPACE geese
2017-02-15 15:55:39 -05:00
Arokha Sieyes
ea275ad626
Fix typo, add playtest message.
2017-02-15 12:07:51 -05:00
Arokha Sieyes
69f0a222e5
More mining stuff
...
Adds binoculars to shuttle
Adds particle gun to shuttle
Adds paper on console with directions
2017-02-15 10:50:58 -05:00
Leshana
348d60ae62
Belter emergency shuttle recall and bugfixes.
...
* Various fixes with display on shutle console and detection of occupied zones etc.
* Remove a comment that buggy unit tests complain about, plus unused procs.
2017-02-14 20:45:02 -05:00
Arokha Sieyes
8c92926848
Opened doors on shuttle, more zone_console tweaks
2017-02-14 18:05:18 -05:00
Arokha Sieyes
9988477f42
Final work on belt mining
2017-02-14 16:36:34 -05:00
Arokha Sieyes
ff6790b174
Console percentage and sizing fixed but not button
...
Dunno why button dun work
2017-02-14 01:02:07 -05:00
Arokha Sieyes
3df9a4f7e6
Merge branch 'roguelike' of https://github.com/VOREStation/VOREStation into roguelike
2017-02-13 22:09:12 -05:00
Arokha Sieyes
c3d0349531
Scoring fix, overlays fix, map tweaks to v7
2017-02-13 22:08:42 -05:00
Leshana
7ebe3fc6d2
Added preliminary skeleton for zone control console, and timeout.
2017-02-13 21:57:41 -05:00
Arokha Sieyes
c47a2cae13
List defines
2017-02-13 21:08:17 -05:00
Arokha Sieyes
70fc3c5af7
Scoring and cleanup
2017-02-13 21:05:38 -05:00
Arokha Sieyes
85fbc527a3
Nearing playtest time
2017-02-13 20:24:54 -05:00
Arokha Sieyes
41169628da
MORE progress.
2017-02-13 01:20:51 -05:00
Arokha Sieyes
9817d67461
More initial codework on rogue miner.
2017-02-12 21:04:31 -05:00
Arokha Sieyes
6d364b9f9e
Beginning of rogue mining zone
2017-02-12 01:29:06 -05:00
