Hawk_v3
10ca5bb70f
Merge remote-tracking branch 'upstream/master'
2018-10-14 17:09:41 +01:00
Anewbe
f0db332943
Remplace sprite hammer with pickaxe
2018-10-09 16:28:45 -04: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
Mechoid
37342fc2d6
Adds a generic proc to the mining vendor to add custom / blank entries.
2018-09-23 02:21:54 -07:00
Anewbe
c35b99e315
Technically adds the Ore Redemption Machine
2018-09-19 02:04:10 -05:00
Hawk_v3
fec9817c54
Moving robot icons around, and merging.
...
Any robot icons in robots_vr.dmi should work automagically if I'm reading vore's robot icon code right. Let's try it.
2018-09-12 23:34:20 +01:00
Mechoid
509addffdf
Adds a whole bunch of Exosuit weapons and other miscellaneous parts.
2018-08-23 20:14:56 -07:00
Atermonera
bb575f0d53
Merge pull request #5468 from Anewbe/is_tool
...
Hopefully Unnoticeable Tool Refactor
2018-08-07 22:06:20 -07:00
Anewbe
73a3417f5d
Various things and floors no longer associate with dirt
2018-08-04 22:41:58 -05:00
Anewbe
c2794c571d
Hopefully fixes some tool-conversion things
2018-08-03 15:13:29 -05:00
Anewbe
7f84aeab9f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool
2018-08-02 22:35:14 -05:00
Anewbe
729ce71aa0
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05:00
Atermonera
f5fb89cb3d
Merge pull request #5421 from Anewbe/IWouldLikeWallsToLookNiceNowPlease
...
Mining turfs maybe probably possibly look nice all the time now I hope?
2018-07-20 21:45:56 -04:00
Anewbe
5d13328a94
Mining turfs maybe probably possibly look nice all the time now I hope?
2018-07-18 22:20:45 -05:00
Repede
2b21dbfd99
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# maps/tether/tether-05-station1.dmm
# maps/tether/tether-06-station2.dmm
2018-06-23 17:53:13 -04:00
Anewbe
71fe7798f6
Ports Fulton Balloons ( #5354 )
2018-06-21 00:20:11 -07:00
Atermonera
aca81ab59c
Merge pull request #5333 from Anewbe/mining_turf_tweak
...
Mining turf overlays should be properly placed now
2018-06-09 15:42:55 -04:00
Anewbe
7d23980df4
Mining turf overlays should be properly placed now
2018-06-06 18:09:07 -05:00
Repede
b83e867682
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
# code/modules/power/lighting.dm
2018-06-02 18:33:44 -04:00
Anewbe
65051fe83b
Rewrite mine turf overlay adding
2018-05-29 14:35:45 -04:00
Arokha Sieyes
3827307e59
Rewrite mine turf overlay adding
...
Stop adding overlays on adjacent turfs. Just add them on yourself, and push them sideways.
2018-05-27 16:27:02 -04:00
Repede
7628d85140
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2018-05-23 00:13:07 -04:00
Arokha Sieyes
cb0f107526
Set a fake ID on shelter buttons to avoid messing with every door
2018-05-18 10:14:27 -04:00
Arokha Sieyes
58189980d2
Shelters: forgot this file
2018-05-14 22:51:11 -04:00
Arokha Sieyes
46f6121624
Capsule shelter QOL
...
Bolts/opacity button, roofs for multiz areas
2018-05-14 22:31:09 -04:00
Heroman3003
aa421e4951
Fixed shelter table being a frame reskin
2018-05-14 11:33:01 +10:00
Repede
9e69f25327
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/_helpers/unsorted.dm
2018-05-13 21:08:22 -04:00
Arokha Sieyes
4ce3f055b5
Fix underdark mob spawn areas again again again
2018-05-04 22:18:03 -04:00
Arokha Sieyes
edec960bda
Shelter sleeper description tweak
2018-04-29 21:03:29 -04:00
Repede
372e145108
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
Fixed conflicts, fixed race racism money bs
2018-04-27 21:45:13 -04:00
Leshana
a8074330f7
POLARIS: Cleanup mineral processing unit
...
Convert those spawn() in New() to use initialize() instead.
Convert hard coded state numbers to use define constants.
2018-04-27 09:50:38 -04:00
Arokha Sieyes
d19e68ba55
No more portable GPS console
2018-04-25 22:16:13 -04:00
Leshana
c09412c33e
Implements the Mining Equipment Vendor
...
Adds the Mining Equipment Vendor machine, which sells lots of items for points earned by mining.
Enhanced the ore processor to give points for processed ore.
Added some miscellaneous items such as hyposprays for miners.
Switched mining machines to use the nice new icons.
2018-04-24 18:18:54 -04:00
Arokha Sieyes
fa7ec1f488
Ports /tg/ fulton system
2018-04-24 12:59:26 -04:00
Leshana
051384ee22
Adds the Resonator
...
A device which sets up resonating energy fields which collapse, mining mineral turfs and/or doing damage to any mobs standing inside. Does no damage to anything else, and damage to mobs is only high when used in low temperature environment (such as... outside or in space)
Uses quite a few dmis, for the icons, in hand icon, and effect icons. Includes sound effects
Ported from tg and Paradise
2018-04-24 12:57:50 -04:00
Leshana
5c6d6a5d20
POLARIS: Cleanup mineral processing unit
...
Convert those spawn() in New() to use initialize() instead.
Convert hard coded state numbers to use define constants.
2018-04-24 12:57:49 -04:00
Arokha Sieyes
cd865a176b
Fix a table sprite and a shelter window layer
2018-04-23 15:44:13 -04:00
Arokha Sieyes
d5c9d3cb4e
Port /tg/ lavaland shelters
...
Nanotech twist rather than bluespace, but whatever.
2018-04-23 15:25:35 -04:00
Repede
95a1fade33
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/clothing/gloves/miscellaneous_vr.dm
# code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/eating/bellymodes_vr.dm
# config/custom_items.txt
# config/example/motd.txt
# icons/mob/human_face_or_vr.dmi
# icons/mob/vore/taurs_vr.dmi
# vorestation.dme
2018-04-20 09:03:58 -04:00
Leshana
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
Repede
7c6aadd829
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/datums/supplypacks/munitions.dm
# code/datums/supplypacks/security.dm
# code/game/area/Space Station 13 areas.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
2018-03-23 20:25:18 -04:00
Cameron653
59844c5553
Xenoarch Multitool & Xenoarch Excavation Drill ( #5058 )
...
* Xenoarch Multitool & Xenoarch Excavation Drill
* Makes the tool work better
* Cuts down on lines & left comments
* change to m
2018-03-22 09:50:50 -07:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Anewbe
6c2d9aa518
Merge pull request #5057 from Nalarac/Durasteel
...
Fixes Durasteel Alloying Producing Slag
2018-03-13 16:48:18 -05:00
Andrew
094fc568dc
Fixes Durasteel Producing Slag
2018-03-12 15:01:28 -05:00
Mechoid
2c6d942fea
Merge pull request #5031 from Anewbe/mining_drill
...
Drill grammar
2018-03-10 13:14:32 -08:00
Heroman3003
7023255635
fix for stacks out of stacking machine ( #5020 )
2018-03-08 13:29:03 -06:00
Anewbe
fa864b1669
Drill grammar
2018-03-07 19:55:02 -06:00
Repede
46577b7321
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/mecha/combat/gorilla.dm
# code/modules/vore/eating/bellymodes_vr.dm
2018-03-06 18:11:39 -05:00
