9a4a01a8bb
Merge pull request #5639 from Heroman3003/smes-fix
...
Fixed smes terminal construction requiring more cable than used.
2018-10-06 16:04:40 -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
a942e145b6
Tweaks emitters and Pacman
2018-09-22 18:45:57 -05:00
2480396c02
Merge pull request #4120 from VOREStation/upstream-merge-5460
...
[MIRROR] APC Sprite Change
2018-09-17 14:06:42 -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
de65c3c643
NanoUI now processes again
2018-08-25 21:13:16 -07: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
eebb627f00
Partially ports the GLOB system
2018-08-14 18:14:09 -05:00
8f42127837
Ports the supermatter grenade, supporting code
2018-08-11 20:10:05 -05:00
c2794c571d
Hopefully fixes some tool-conversion things
2018-08-03 15:13:29 -05:00
7f84aeab9f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool
2018-08-02 22:35:14 -05:00
729ce71aa0
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
2018-08-02 21:45:15 -05:00
22f91f07a5
Merge pull request #5460 from Woodratt/07312018_apcspritechange
...
APC Sprite Change
2018-08-02 15:25:41 -04:00
24549cd3c4
Merge pull request #5460 from Woodratt/07312018_apcspritechange
...
APC Sprite Change
2018-08-02 12:24:40 -07:00
67bc6ac4ed
APC Sprite Change
...
- Port from Virgo recolored slightly to match closer to the old sprite
- Addition of directional sprites for the APCs
2018-07-31 17:56:04 -07:00
6bdf355e6d
Finishes thunderstorms.
2018-07-31 14:45:26 -04:00
5c2d57e43b
Admin Supermatter Setup now closes the monitoring room shutters ( #5442 )
...
* Admin Supermatter Setup now closes the monitoring room shutters
* Fixes a copy-paste error
2018-07-28 01:09:01 -04:00
1b173f98ac
Admin Supermatter Setup now closes the monitoring room shutters ( #5442 )
...
* Admin Supermatter Setup now closes the monitoring room shutters
* Fixes a copy-paste error
2018-07-27 22:08:29 -07:00
d21cea3965
R-UST Fixes. ( #5410 )
...
R-UST Consoles can now be Deconstructed.
R-UST Consoles will not be inaccessible if broken or unpowered.
R-UST Consoles now accurately feed back if they're unpowered or broken.
R-UST Fusion field can no longer be stared at to hard by the AI.
2018-07-14 15:15:52 -04:00
07dfd5211b
R-UST Fixes. ( #5410 )
...
R-UST Consoles can now be Deconstructed.
R-UST Consoles will not be inaccessible if broken or unpowered.
R-UST Consoles now accurately feed back if they're unpowered or broken.
R-UST Fusion field can no longer be stared at to hard by the AI.
2018-07-14 14:15:39 -05:00
5a221f37a4
Merge pull request #5398 from Mechoid/CablePrints
...
Cutting cables will now transfer fingerprints.
2018-07-09 11:39:31 -04:00
1dbfe94711
Cable fingerprints.
2018-07-08 14:36:13 -07:00
ef2c62c63a
Alien Cable Coil Fix ( #5365 )
...
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.
* Prevents you from going over the 30 cap.
* Tochat
2018-06-21 03:26:14 -04:00
2e987ab900
Alien Cable Coil Fix ( #5365 )
...
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.
* Prevents you from going over the 30 cap.
* Tochat
2018-06-21 00:26:02 -07:00
fe94038e7a
Recharger refactor
2018-06-16 17:15:59 -04:00
91edca4434
Recharger refactor
2018-06-14 15:37:22 -05:00
4ff48da96a
SYNC: Map changes for lighting
2018-05-30 00:56:12 -04:00
c0c091ed4a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018
...
# Conflicts:
# code/modules/power/lighting.dm
# icons/turf/walls.dmi
2018-05-29 21:05:27 -04:00
d308cb4563
Merge pull request #5269 from deathride58/fancylighting
...
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
2018-05-29 13:33:27 -05: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
09a4cab10f
Bumps up the brightness range just a tad to accommodate for the low density of lights aboard the station
2018-05-17 12:17:52 -04:00
927050ce44
Fix various syntactic problems
2018-05-16 21:43:18 -07:00
718ca41ea0
tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1
2018-05-16 01:42:01 -04:00
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
91f0c05a4b
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
862f1eff44
Override Polaris change: keep our light power usage the same as it was
2018-05-10 13:48:54 -04:00
33202c5c38
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/giant_spider.dm
# html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04: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
9dda8cfe92
Power cost decrease on Lights and Shield Diffusers
2018-04-29 20:11:20 -07: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
c7cd04b2bb
POLARIS: Fix emitters connected to powernet remotely.
...
Ensure when we unanchor an emitter that we disconnect from powernet.
2018-04-19 20:51:15 -04:00
b45e065a96
POLARIS: Fix emitters connected to powernet remotely.
...
Ensure when we unanchor an emitter that we disconnect from powernet.
2018-04-17 20:00:29 -04:00
f80fe6a1c9
Optimizes Powercell Update Icons
2018-04-12 18:53:47 -04:00
228e37e923
Optimizes Powercell Update Icons
2018-04-10 19:58:09 -04:00
e08cbef044
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04
...
# Conflicts:
# code/modules/economy/lorenews.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
2018-04-06 15:40:06 -04:00
d5c5249327
Merge pull request #5147 from VOREStation/vplk-atmos-layers
...
Switch cables and pipes to use define constants instead of literals for layers.
2018-04-04 17:42:36 -07:00
8c3e41a705
Small fixes and ports discovered during merge. ( #5138 )
...
* POLARIS: No string compare for assistants
* POLARIS: Move these planes to more useful places
* POLARIS: Only spam ghosts with chat messages from things with real clients
* Fix small forgotten lines of text accidentally left out of VS syncs.
* Fix typo'd plane in lighting.dm and remove redundant definitions.
2018-04-04 17:35:15 -07:00
7da46a6dcc
Switch cables and pipes to use define constants instead of literals for layers.
...
Also fix a few things to be on the correct plane. Basically the under-floor stuff is supposed to be on PLATING_PLANE.
Portable atmospherics go on object layer so they are above stationary machinery, given that they move around.
Fixed wires to be on top of pipes like they used to be, otherwise they'd be obscured too often.
2018-04-02 21:50:03 -04:00
88c4ca0246
Fix light/camera layers for macros and fix constants for them too.
2018-04-01 16:29:52 -04:00
6756c5a483
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
...
# Conflicts:
# .travis.yml
# code/ATMOSPHERICS/components/unary/outlet_injector.dm
# code/__defines/_planes+layers.dm
# code/__defines/chemistry.dm
# code/__defines/mobs.dm
# code/_helpers/mobs.dm
# code/_onclick/hud/robot.dm
# code/game/area/areas.dm
# code/game/machinery/computer/supply.dm
# code/game/machinery/cryopod.dm
# code/game/machinery/doors/airlock.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/devices/communicator/messaging.dm
# code/game/sound.dm
# code/game/supplyshuttle.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/events/event_container.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/language/language.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_powers.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species_shapeshift.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_powers.dm
# code/modules/mob/living/say.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/logout.dm
# code/modules/mob/mob_helpers.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_icon.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_containers/syringes.dm
# code/modules/shuttles/shuttle.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/wildwest.dm
# maps/southern_cross/items/clothing/sc_head.dm
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-03-31 09:20:59 -04:00
Anewbe