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
Arokha Sieyes
fa95ae3d42
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2018-03-04 13:32:53 -05:00
Screemonster
13e83b00d1
Makes drills report faults over supply channel ( #4989 )
...
* Makes drills report faults over supply channel
* too chatte
* caps and punctuation are important
2018-03-03 18:47:07 -06:00
Arokha Sieyes
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
BillyBangles
f49b1a9ad2
Adds ice puzzle POIs ( #4963 )
...
* adds slippery ice tiles
* adds ice puzzle POIs
also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
2018-02-27 17:45:47 -08:00
Kelshark
9bb51e45e4
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/machinery/vending.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/vore/eating/bellymodes_vr.dm
# config/custom_items.txt
# icons/obj/mining.dmi
2018-02-24 22:51:59 -05:00
Leshana
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
Mechoid
1de47d364c
Merge pull request #4899 from Anewbe/rad_anomaly
...
Weakens the random mining radbursts
2018-02-21 21:17:59 -08: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
Anewbe
cd8703d95a
Weakens the random mining radbursts
2018-02-20 18:08:00 -06:00
Mechoid
8a3dcc5cc1
Makes Mining Satchels brute-force their way out of lagging, minerborg prodding.
2018-02-20 12:58:13 -08:00
Arokha Sieyes
5967bb6dc5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/modules/mob/living/carbon/human/species/species.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
Anewbe
7cc8fa0cba
Gives Miners shinybits. ( #4840 )
...
* Gives miners marker beacons, moves their locker to another file
* Makes marker beacons ITEM_SIZE_SMALL
2018-02-17 11:19:48 -08:00
Leshana
5847319443
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-05 15:50:13 -05:00
Leshana
cef001bf2a
Update every initialize() proc to return an initialize hint.
...
* Yes, all of them.
* Also did a few corrections to redundant New() and broken Destroy() along the way
* Renamed the turf_initializer.initialize() proc to InitializeTurf to avoid confusion.
* Subsumed /area/proc/initialize into /atom/proc/initialize() - Made /area's LateInitialize to get same behavior as before.
2018-02-03 01:00:57 -05:00
Kelshark
c048a8ea8b
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/vore/weight/fitness_machines_vr.dm
# config/custom_items.txt
2018-02-02 19:25:51 -05:00
RadiantFlash7
22d13f10c2
All my changes so far.
...
note to self: Engineering, Perma, civil jobs, and electricity+piping
2018-02-02 04:57:01 -05:00
Ketrai
7ed9e2ea36
Making mining drills faster. (fix)
...
All drills but borgdrill, and diamond drill are now 10% faster, which is a significant boost.
Diamond drill is 20% faster
Borg drill is roughly ~ 15% faster
Felt like with the removal of the rigsuit, mining feels extremely slow and clunky again. Ripley has gotten buffed, which makes it an excellent contendor now, with it being slightly slower whilst restricting movement, but better at tunneling, and gathering up veins. As well as allowing the hauling of large amouns of crates, and stationary drills.
This change should make the normal drill feel smooth enough for the early stages, especially nice if there is no research, such as on skeleton shifts, yet you wanna do some mining for abandoned crates and such. It also makes upgrading the drills feel even nicer.
Before update:
Basic drill is 8x as slow as a diamond drill.
Advanced drill is 6x as slow as a diamond drill.
Even the best drill, aka jackhammer and plasma cutter, is 4x as slow as a diamond drill.
Borgs were around 3x as slow as a diamond drill; Meaning they start with far superior gear compared to a miner.
After update:
Basic drills are still 8x times as slow as a diamond drill, so that upgrade still feels just as powerful
Advanced drills are now 6.75x as slow as a diamond drill.
Jackhammer/plasma cutters are now 4.5x as slow as a diamond drill.
Borg drills are now 3.25x as slow as a diamond drill.
2018-02-02 10:05:03 +01:00
