058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
409aaba802
Remove
2024-09-09 02:36:53 +02:00
04de351a1e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-07-17 16:14:16 +02:00
6cabe9f7e6
Undefines local defines and moves global to __define ( #16028 )
...
* first set of defines
* some more
* .
* final defines
* del local define
2024-06-09 17:29:20 +10:00
a17d96cb92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-10-30 11:24:00 +01:00
9a94306585
Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one
2023-10-01 09:34:43 +10:00
bc646ab0d5
fixed tesla examines (again)
2023-09-11 03:44:30 +01:00
10b3895fcd
Fixes recaster
2023-09-02 21:58:35 +10:00
e8d739008a
Replaces Limiter with Collector due to redundancy
2023-09-02 21:46:37 +10:00
d31f91fb65
Adds a variety of new tesla coils with unique properties and upgrades
2023-09-02 21:39:24 +10:00
c5216c0645
tesla component examine tweaks
2023-09-02 01:17:47 +01:00
ff7df50a7e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-21 19:03:35 +02:00
10d2178516
More 515 Compatibility
2023-06-05 19:29:40 +02:00
30f994a544
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-05-10 16:00:23 +02:00
fc9c2732de
friendlier tesla components
2023-05-06 08:28:27 +01:00
1aa4c73e8d
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
2022-08-27 08:49:56 -04:00
3f9af78f3a
/atom New() => Initialize() [MDB IGNORE]
2021-11-14 03:09:51 -05:00
4e14241cb8
Voreupdate
2021-07-21 15:16:48 +02:00
34982728cb
Add 'as anything' to various for loops
2021-07-20 12:39:59 -04:00
dd8893112f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-08 09:40:23 +02:00
b71c7e7271
Use material defines more
2021-07-03 18:18:05 -04:00
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
b8c1f06675
Finishes this PR
2021-05-27 13:06:41 -04:00
2dedb1bdde
Voreupdate WIP
2021-04-09 09:36:25 +02:00
4690411915
Remove unnecessary 'signatures'
2021-04-08 12:39:14 -04:00
9c6581fe6c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-03-11 17:36:42 +01:00
b936cd6f25
Updates the _vr recipies to include copper.
2021-03-11 06:35:28 +10:00
5d64303087
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-11-17 16:26:30 +01:00
af3f77e8ca
Merge pull request #9221 from VOREStation/upstream-merge-7703
...
[MIRROR] Make the tesla ball eventually run out of energy
2020-10-18 15:25:42 +03:00
066a36487b
Make the tesla ball eventually run out of energy ( #7703 )
...
Currently the tesla ball only loses energy until it runs out of orbiting mini-balls, then sticks around forever. This makes it keep losing energy until it dissipates.
2020-10-15 05:42:02 -04:00
d057218154
no escape from electric fate ( #7702 )
2020-10-15 05:40:44 -04:00
7bf3fc31bc
Removes nanoUI autolathe code stuff.
2020-09-15 19:06:46 -03:00
9b4843da61
i think this is all the changes ?
2020-07-27 20:59:20 -03:00
22880f526d
Voreupdate
2020-07-02 15:39:00 +02:00
736fdab6e3
Merge pull request #7273 from Cyantime/obs
...
Observing improvements
2020-06-24 11:36:18 -04:00
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
8228c60f4d
Adds new autolathe interface for testing before sending to polaris/virgo
2020-04-16 00:16:52 -03:00
1d4d3afd45
Merge pull request #6756 from Neerti/lightning_fixes
...
Fixes various lightning strike bugs
2020-02-27 23:58:36 -05:00
88df3de3e6
Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy
...
Infinite Frame Fixy
2019-06-06 13:11:59 -04:00
16fb2c1036
Fixes tesla logic bug
2019-04-10 12:00:24 +10:00
55b4d304f5
Conflict Resolution Part One
2019-03-27 15:21:58 -04:00
fe0b7373b3
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -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
eebb627f00
Partially ports the GLOB system
2018-08-14 18:14:09 -05:00
izac112