Unknown
|
3aa0fdfda5
|
Removes conductive flags from VR stuff
|
2019-03-28 21:45:38 -04:00 |
|
Unknown
|
1e45296d31
|
Conflict Resolution
|
2019-03-27 10:58:53 -04: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 |
|
kcin2001
|
58a91f0748
|
Fixes the Polecat control board name
|
2018-05-24 10:14:26 -07:00 |
|
kcin2001
|
92edb296e0
|
minor naming fix
|
2018-05-12 11:51:39 -07:00 |
|
kcin2001
|
fea679888a
|
Adds Micro mechs
|
2018-04-29 16:07:32 -07:00 |
|
Screemonster
|
34bd240fe4
|
nerfs micromech punches
|
2018-01-30 01:12:13 +00:00 |
|
Cameron653
|
35afdc29c9
|
Fixes a 512 compile error.
|
2017-10-17 23:40:07 -04:00 |
|
Leshana
|
8b0cf0617b
|
Fix VOREStation use of color macros so we pass the new stringent macro tests.
|
2017-05-08 22:34:13 -04:00 |
|
Screemonster
|
1d57e78c1f
|
fixes copypasta'd comments
|
2017-02-07 01:42:35 +00:00 |
|
Screemonster
|
2a9a4f657b
|
Adds the gopher and equipment, better icon for weasel
|
2017-02-06 06:49:33 +00:00 |
|
Screemonster
|
931af36a2b
|
Adds micro-only light mech/vehicle framework, plus equipment.
|
2017-02-05 09:04:37 +00:00 |
|