Arokha Sieyes
|
47ccc655db
|
Deprecate the stream operator
|
2020-02-12 19:38:43 -05:00 |
|
Arokha Sieyes
|
007fda1bc1
|
Fix nifsoft vendor runtime
Caused by the vendor attempting to throw intangible software at people either due to wires cut or vendor virus.
|
2019-12-14 13:57:52 -05:00 |
|
Novacat
|
466516b066
|
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
|
2019-04-08 15:24:27 -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 |
|
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 |
|
Arokha Sieyes
|
cd480fd323
|
Fix softshop affected by APC early init
|
2018-01-21 19:10:16 -05:00 |
|
Arokha Sieyes
|
8225d30b9e
|
VS: AR Entopics and Soulcatcher projecting (+Worldbender)
|
2018-01-20 23:29:24 -05:00 |
|
Cyantime
|
61d11c1b5e
|
Fixes nifsoft vender showing departmental packages as wares
|
2017-07-31 15:49:40 -04:00 |
|
Arokha Sieyes
|
be62d7693e
|
Make syndie NIFSoft Shop free
And remove a silly old comment I was referencing.
|
2017-06-06 19:35:45 -04:00 |
|
Arokha Sieyes
|
08e7703e4f
|
Finishing Up NIFs
Squashed commit:
[4b18ca1] Finishing up NIFs
[e4adb4a] Tons more NIF work
All the implants are done!
|
2017-06-06 19:34:41 -04:00 |
|
Arokha Sieyes
|
58ee6891f2
|
Additional Work on NIFs
Squashed commits:
[9563a9a] All the stuff I forgot to commit
|
2017-06-06 01:00:46 -04:00 |
|