f26d93f75c
Expanded leisure area on the tether ( #17441 )
...
* Expanded leisure area on the tether
Significant changes to the tether's pool area. The tiny, highly exposed gym has been moved to the south of the pool, therefore a bit more secluded but also larger and prettied up. The neighbouring toilets now have a locker room. There is a small session room that can be locked on the south side of the gym. There is a very small sauna and massage room on the west of the pool. There are now a few tables and chairs around the pool now, and the old gym has been converted into another, more visible pool-themed cafe/bar (no alcohol!)
Also added treadmills.
* Wires and non-smoking area
* Conflict fix
* Revert "Conflict fix"
This reverts commit e8b98f8c7a
2025-03-30 22:22:00 +02:00
703e59819c
Lose some weight, fatty ( #16913 )
...
Changed fitness machines and structures to actually help you lose weight other than rapidly draining your nutrition. Machine types have had their weight loss multiplied by 10 so they no longer take 80 or 40 uses to lose 1lb. Structure types previously had no weight loss attached, they now have similar amounts to the machine types.
2025-01-16 16:01:08 -05:00
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
9a94306585
Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one
2023-10-01 09:34:43 +10: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
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
893130bdff
Merge nutrition refactor for vorestation
2020-04-29 18:34:22 -04:00
5f9ec463c3
VOREStation Specific: Always call update_use_power() instead of directly setting the use_power var.
2020-03-24 14:40:54 -04:00
d5d5385b76
Cleanup vore code
2020-03-19 21:17:24 -07:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
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
ec20277805
Removed unnecessary 'src's, added missed cooldown
2018-01-31 20:20:43 -05:00
35c4a8030e
Exercise equipment changes/refactor
2018-01-31 07:30:40 -05:00
92ff62c95c
Moved files to a place they make sense ( #575 )
2016-09-20 18:46:17 -04:00
5d51bc48c4
Travis wake up.
2016-06-18 19:20:25 -04:00
c16257fd58
Travis wake up.
2016-06-18 19:19:29 -04:00
eeffdd8594
Touch up fitness machine code
2016-06-06 02:06:02 -04:00
fd1bf82dfa
Adds weight machines and weight variables
...
Exactly what it says on the tin.
Weight descriptions aren't in yet, but the machines remove weight and
nutrition.
Compiles without errors/warnings.
2016-05-08 17:04:53 -04:00
SatinIsle