2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
549adf6baf
Merge pull request #5719 from lbnesquik/Kates-Typo-fix
...
Minor typo fix
2018-10-30 13:06:43 -04:00
30a8a3ce31
VS edit merges
2018-10-20 17:37:08 -04:00
3a9c13b937
Ports Vote to SMC
2018-10-20 01:53:13 -04: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
3aca2c38e2
Yet Another Circuit Update ( #5549 )
...
* Circuit updates, adds new components, improves printer, new assemblies.
* Finishes powernet circuit.
* Adds wearable assemblies.
* Finialization before merging with GLOB port.
* Finishes circuit update, hopefully.
* Forgot to undo map.
* Removes debug output.
2018-09-12 20:51:32 -05:00
eb94467f39
Merge branch 'master' into upstream-merge-5432
2018-09-09 17:57:31 -04:00
8b7fbbe98c
Merge branch 'master' into upstream-merge-5424
2018-09-01 18:40:37 -04:00
a60d61f594
Update planets.dm
2018-09-01 18:39:06 -04:00
50efc3c01f
Merge pull request #5502 from Anewbe/glob_is_hungry_for_souls
...
Partially ports the GLOB system
2018-08-22 11:32:13 -07:00
6ef5940260
Merge pull request #5507 from Verkister/patch-14
...
Fixes incorrect ETA in crew transfer announcement
2018-08-19 00:05:49 -04:00
e02cb60542
Fixes incorrect ETA in crew transfer announcement
2018-08-18 12:27:55 +03:00
eebb627f00
Partially ports the GLOB system
2018-08-14 18:14:09 -05:00
6ffd299fd7
Merge pull request #5461 from Atermonera/supply_nanoUI
...
Refactors supply controller
2018-08-04 02:55:15 -04:00
9c081d5cc7
Merge pull request #5466 from Woodratt/08022018_HolomapPort
...
Holomap Port
2018-08-03 17:06:37 -07:00
cd20465d38
Holomap Port
...
- Port of Holomaps from Virgo
2018-08-02 15:52:56 -07:00
ef6c5abf15
Refactors supply controller.
...
Supply consoles now run nanoUI
2018-07-31 19:11:02 -07:00
8639d49c34
Begins work on lightning.
2018-07-28 11:08:30 -04:00
f5312bcedd
Refactors supply controller
2018-07-24 11:04:16 -04:00
4bfb0e163c
Merge branch 'master' into upstream-merge-5420
2018-07-23 12:22:39 -04:00
95398466de
refactors supply controller
2018-07-22 13:44:44 -07:00
46f7b22838
Fix virgo implant stuff
2018-07-21 14:21:17 -04:00
928fbe5ac8
Fixes indoor weather, hopefully for real this time.
2018-07-20 19:08:42 -04:00
bca4277e4f
Fixes indoor weather, hopefully for real this time.
2018-07-19 20:25:05 -04:00
2750a9f78f
Fixes Indoor Weather
2018-07-18 15:21:12 -04:00
d3754f8bfc
Attempts to fix indoor rain.
2018-07-17 21:30:02 -04:00
f0a7b2466e
Merge pull request #5390 from VOREStation/pol-planetstartup
...
Fixes some planets controller runtimes
2018-07-05 15:50:15 -04:00
434950bbcc
Fixes some planets controller runtimes
...
Comes up if you use outdoor turfs in places other than planet z-levels
2018-07-04 21:58:22 -04:00
c6fae09c1d
Merge pull request #3888 from VOREStation/upstream-merge-5322
...
[MIRROR] Move planets to SSplanets
2018-06-16 13:57:09 -04:00
9b00166de0
Allows AIs to produce and control maint/construction/mining drones. ( #5282 )
...
* Allows AIs to control maint/construction drones.
* Radio control online.
* Things Not Saving
* Drone control respects intellicores.
* Config control, AI drones are disableable if the AI isn't an antag.
* There's a diff so it must have saved. Right?
* No un/wrenching of the core.
* Complies to Replies.
2018-06-15 20:15:03 -04:00
4cd51ff79f
Allows AIs to produce and control maint/construction/mining drones. ( #5282 )
...
* Allows AIs to control maint/construction drones.
* Radio control online.
* Things Not Saving
* Drone control respects intellicores.
* Config control, AI drones are disableable if the AI isn't an antag.
* There's a diff so it must have saved. Right?
* No un/wrenching of the core.
* Complies to Replies.
2018-06-15 19:14:16 -05:00
98b3af60fa
Move planets to SSplanets
2018-06-15 19:05:38 -04:00
9e28740697
Merge pull request #5322 from VOREStation/pol-planetstart
...
Move planets to SSplanets
2018-06-15 18:05:25 -05:00
462effc1d2
Creates SSplanets subsystem
...
For SPEEDYNESS
It probably works. I mean it's hard to sit there for 8 hours and test it. But it seems to work okay. At worst if it doesn't you'll have weather that doesn't make sense. ;v
2018-06-02 19:09:35 -04:00
d8eebde5a2
Planet controller startup delay
2018-06-02 12:36:47 -04:00
29004fe093
Planet controller startup delay
2018-06-02 11:06:53 -04:00
40b1a56bdc
Revert "Revert "Upgrades Planetary Weather to vis_contents ( #5170 )""
2018-06-01 20:35:28 -04:00
d430448ebf
Split and clarify global lists of processing vs non-processing machinery. ( #5307 )
...
* Renaming local var 'machines' to avoid confusion with the global var of same name.
* Delete the unused process scheduler machinery.dm file. Long since replaced with SSmachines
* Split and clarify global lists of processing vs non-processing machinery.
- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
2018-05-28 15:57:02 -04:00
30f10be83e
Split and clarify global lists of processing vs non-processing machinery. ( #5307 )
...
* Renaming local var 'machines' to avoid confusion with the global var of same name.
* Delete the unused process scheduler machinery.dm file. Long since replaced with SSmachines
* Split and clarify global lists of processing vs non-processing machinery.
- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
2018-05-28 12:56:49 -07:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.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/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
6b4be2d7a8
Paranoid logging and byond account age
...
Adds the PARANOIA_LOGGING setting to config.txt (and PANIC_BUNKER which was missing for some reason) and updates example.
PARANOIA_LOGGING (also available as a verb for admins in Server) begins notifying admins of any 0day byond accounts, or users who have never joined before. For when you don't quite want to panic bunker.
Also makes this information available in player panel. Requires SQL connection.
2018-05-22 23:03:53 -04:00
1c519d28ed
More small fixes and such.
...
-Applies the suggested durability tweak.
-Makes backups save nif examine message.
-Makes new nifs spawn with the examine message if provided upon resleeving and such. Basically the initial character spawn pref loading was the only case that wasn't resetting the message to default.
-Fixes soulcatcher backups breaking ooc notes. (Applies ooc notes from character to the brainmob before saving it. Also includes brainmobs into the formerly human exclusive backup part responsible of saving nif and ooc notes to backups.)
-Makes soulcatcher backup feature back up the owner if dying inside a belly of a soulcatcher lacking pred. (SC backup setting was completely voided if the pred didn't have SC themselves so your shit would be gone for good)
-Fixes contaminate/digest_act sending holder mobs to shadow realm if holder is contained inside the equipment(storage/pockets) of a prey getting gurgled instead of the pred's gut. (As prey gear gets all contaminated at once while getting dumped in the gut, which would contaminate>digest_act the holder items prematurely during the gurgle dump.)
2018-05-11 13:49:16 +03:00
44cc2e26c7
Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD
...
for(var/bad_code in world)
2018-05-01 13:00:18 -07:00
62ce4196e5
Bonus: Make Travis Show the Active Edges
2018-04-29 18:43:02 -04:00
be73b8c36a
for(var/bad_code in world)
...
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
e3e1a7ad9c
Upgrades Planetary Weather to vis_contents ( #5170 )
...
* Upgrades Planetary Weather to vis_contents
Makes the weather on Sif use vis_contents instead of overlays, which should fix all weather-related icon issues, and may or may not be faster.
Weather updates instantly now.
Fixes indoor PoIs having outdoor weather.
* Tries to appease Travis
2018-04-28 20:40:11 -07:00
7a6ff116a3
POLARIS: Varset Callback
2018-04-27 20:05:11 -04:00
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# 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-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
a75c575491
Merge pull request #5200 from VOREStation/vplk-stonedmc-sync
...
Port "The Punisher" (subsystems/MC impovement) from TG
2018-04-24 15:20:57 -05:00
ac7e949779
Tab2Space ssair
2018-04-23 17:23:03 -04:00
Atermonera