izac112
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
VerySoft
4628e467c2
Tweaks and tidying
...
Adjusts some types to tidy up the mob list. Put some of the mobs that can vore under the vore tab, removed the clown mobs from /mobs_monsters because they were the only thing in there, so there wasn't really any point in hiding them a level deeper, and generally looked for subtypes that didn't have anything in them, and commented those out. Did you know that telesci is supposed to have a chance to spawn hostile mobs if you mess up? It's true! I may or may not have fixed it, I don't play telesci, but it uses a path that actually has mobs in it now.
2023-07-03 02:09:51 -04:00
izac112
509325db9f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-09-17 22:18:49 +02:00
Heroman
e9687e294b
Fixes a few more runtimes
2022-09-06 05:37:37 +10:00
izac112
0d57b37757
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-09-04 22:57:35 +02:00
C.L
610a2a7ec5
Buffs artifact spawns in the map. Lowers rogueminer.
...
Artifacts used to be confined to about one Z level: The mining asteroid.
Now with there being a LOT more Z levels, this number really hasn't changed and it means that artifacts are harder to find, being spread across many more Z levels.
This could mean that if you had bad RNG, you would have 6 artifacts spread across every Z level, meaning xenoarch would very quickly exhaust the possible artifacts they had nearby and after exploring every Z level that spawns artifacts, they'd only have 6 artifacts.
This doubles that number so now there is 12 artifacts that spawn by default, up to 24.
Meanwhile, roguemining would spawn 6 to 12 artifacts per mining area visited. This meant each rogue mining area had as many artifacts as the entire universe had. This was obviously unintended, so this fixed that by lowering it to 0 or 1 artifact per roguemining Z level.
2022-08-31 21:58:33 -04:00
izac112
4e14241cb8
Voreupdate
2021-07-21 15:16:48 +02:00
Aronai Sieyes
34982728cb
Add 'as anything' to various for loops
2021-07-20 12:39:59 -04:00
izac112
897cf4b57e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-17 10:36:29 +02:00
577b986ba6
Convert some bools to TRUE/FALSE instead of 1/0. ( #11100 )
...
Co-authored-by: Aronai Sieyes <arokha@arokha.com >
2021-07-16 13:43:25 -04:00
izac112
bcad22ac98
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-06-23 19:20:09 +02:00
Aronai Sieyes
85c31e9fda
WIP fix of this PR
2021-06-21 19:29:43 -04:00
izac112
ffc6a2a369
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-06-18 17:01:47 +02:00
Aronai Sieyes
1696db4842
Move most/all overlay use to SSoverlays
...
Except for the ones I'm about to change in the
lighting commits!
2021-06-17 00:11:13 -04:00
izac112
b9034ce50b
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-05-28 06:15:01 +02:00
Aronai Sieyes
28a6962d51
VS: One more disambig
2021-05-27 12:10:30 -04:00
Aronai Sieyes
0c954142d2
VS: Times /list was used wrong
2021-05-27 12:05:00 -04:00
izac112
5d64303087
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-11-17 16:26:30 +01:00
Cyantime
d8f87b60f8
Remove gravity from debris field and rogue mining zones
2020-08-27 05:18:26 -04:00
izac112
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
ShadowLarkens
3d21087f8b
TGUI Asteroid Belt Scanning Console
2020-08-16 22:27:09 -07:00
Repede
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
Leshana
5f9ec463c3
VOREStation Specific: Always call update_use_power() instead of directly setting the use_power var.
2020-03-24 14:40:54 -04:00
Leshana
c837078105
Replaced "area" shuttles with "landmark" shuttles.
...
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.
- Shuttles no longer require a separate area for each location they jump to.
Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
This means that more than one shuttle could use the same docking port (not at the same time of course).
- Enhanced shuttle control computers to use nanoui if they didn't.
- Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
- Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
- Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests
This all required a bit of infrastructure improvements.
- ChangeArea proc, for changing the area of a turf.
- Fixed lighting overlays actually being able to be destroyed.
- Added a few utility macros and procs.
- Added "turf translation" procs which are like move_contents_to but more flexible.
2020-03-05 10:29:08 -05:00
Repede
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Arokha Sieyes and Leshana
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Heroman
38bf0a33c6
Fixes and re-implements Rogue Mining (Belt Mining)
2020-01-23 18:43:20 +10:00
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 and GitHub
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 and GitHub
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
izac112