Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Atermonera
2c8197bd9a
Merge pull request #6415 from Heroman3003/bellfixes
...
Adjusts some desk bell mechanics
2019-08-23 21:43:38 -04:00
Novacat
31924e23de
Update materials.dm
2019-08-08 16:09:13 -04:00
Atermonera
0469a309cc
Adds NOCONDUCT to Some Items
2019-08-08 16:07:50 -04:00
Atermonera
8952374cce
Merge pull request #6264 from Heroman3003/awood
...
Fixes alien wood issues
2019-07-03 23:09:42 -04:00
Atermonera
9d207a28fd
Merge pull request #6249 from Heroman3003/lead-stack
...
Makes lead icon display stack
2019-07-01 20:48:45 -04:00
Ketrai
cea411049a
Adds a durasteel fishing rod.
2019-06-07 16:48:35 +02:00
Neerti
5a3040a08d
Merge pull request #6183 from Mechoid/FixPrecursotechOversights
...
Fixes some Precursotech oversights.
2019-05-31 22:18:00 -04:00
Neerti
f5f20628fd
Merge pull request #6169 from GeneriedJenelle/patch-1
...
Ports Radial Menus
2019-05-28 14:25:49 -04:00
Atermonera
90ee680dd5
Fishing!
2019-05-06 14:16:27 -04:00
Neerti
16b3b58259
[REVIEW] Ports Modular Computers from Baystation
2019-04-28 22:06:40 -04:00
Novacat
6d123c8d73
Update materials.dm
2019-04-13 22:55:08 -04:00
Neerti
fc7c6f38b4
Base features for Precursotech and Anomalotech Expansion
2019-04-13 22:44:52 -04:00
Neerti
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
Anewbe
2572f3a145
Merge pull request #5747 from Neerti/fulltile_window_improvements
...
Makes fulltile windows seperate from dir
2018-12-04 14:37:19 -05: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
Mechoid
69ad0ce12b
Cult Girders are back to being proper.
2018-08-30 22:21:21 -07:00
Atermonera
1216f97663
Adds roofing tiles ( #5409 )
...
* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects
Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area
* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects
Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area
2018-07-14 15:24:33 -04:00
Atermonera
e70fb213ed
Adds roofing tiles ( #5409 )
...
* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects
Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area
* Adds roofing tiles
They're used to place plating overhead without going up a floor
And to remove weather effects
Changing a turf will correctly inherit the old outdoors variable, so that roofing tiles can check it when deciding whether to roof an area
2018-07-14 14:24:18 -05:00
Arokha Sieyes
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04:00
Mechoid
917c7b71a5
Box of Things for Events and the Future MK1 ( #5281 )
...
* Lots of Stuff for Events
* Adds changelog.
* Review & QOL
2018-05-25 16:26:31 -07:00
Arokha Sieyes
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
Arokha Sieyes
759bec84d0
Nerf marble
...
Please.
2018-04-19 02:36:02 -04:00
Verkister
88c1a7d845
Fixes borg synth sheet naming when depleted to 1
...
-The thing changing the sheet stack names to singular/plural no longer breaks the naming for borg sheet synthesizers.
2018-04-18 16:07:36 +03:00
Arokha Sieyes
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
Mechoid
5dc7189cf7
Various Loot Pile and Dungeon objects Stage Uno ( #4975 )
...
* Loot Piles
* Mecha Loot Piles, Random Tool Spawners
* Fix Random Spawners, don't use Fiftyspawners
Fix Fiftyspawners
2018-02-28 11:18:44 -06:00
Arokha Sieyes
3fe17274d2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/ATMOSPHERICS/pipes.dm
# code/game/turfs/flooring/flooring.dm
# code/modules/clothing/clothing_accessories.dm
# code/modules/mob/living/carbon/human/inventory.dm
# html/changelogs/.all_changelog.yml
2018-02-27 21:27:35 -05:00
BillyBangles
f49b1a9ad2
Adds ice puzzle POIs ( #4963 )
...
* adds slippery ice tiles
* adds ice puzzle POIs
also bedrock (impassable) rock, and ice crystals (which use placeholder
graphics for now)
2018-02-27 17:45:47 -08:00
Nerezza
c7fdd099b6
Flooring fixes
...
Firstly it fixes a long-standing bugs with constructable flooring not actually populating on server startup, but instead through a proc that's only called on existing floor tiles.
Second it changes sif wood tiles into a child of wood tiles now that the reason for carpet colors not working is known & fixed.
2018-02-24 15:31:10 -06:00
Leshana
30454ccdc3
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
...
# Conflicts:
# code/game/jobs/job_controller.dm
# code/game/machinery/oxygen_pump.dm
# code/game/objects/items/weapons/storage/firstaid.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/organs/internal/eyes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-02-23 21:55:42 -05:00
BillyBangles
5486edf567
Adds various cabin-related things. ( #4888 )
...
* adds fireplace, makes bonfire generate heat
kinda, anyways
* adds sifwood tiles, fixes old blue carpets
old blue carpets are now known as "teal carpets." they still come in the
carpet crate from cargo.
* lets you dig up tree stumps with shovels
* changelogs in the house
* adds a delay to digging up stumps
digging up stumps is easier said than done
2018-02-21 15:45:01 -06:00
Leshana
7ed3d2c2f6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16
...
# Conflicts:
# code/_onclick/hud/screen_objects.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/modules/admin/admin_verbs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/gloves/color.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/simple_animal/aliens/alien.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/goose.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_defines.dm
# code/modules/projectiles/projectile/special.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-7.dmm
# vorestation.dme
2018-02-17 00:35:29 -05:00
BillyBangles
f5dfbff1bd
Build igloos and snowmen ( #4811 )
...
* adds packed snow brick material
* makes snow walls spawnable for mapping
* adds snowmen
craft them with snow. duh.
* snow spider triggers arachnophobia
also changelog.
2018-02-15 14:25:51 -06:00
Leshana
b4b9cea362
Make light switches constructable
...
Adds constructable light switches using Brown's construction stage icons.
2018-02-14 21:26:00 -05:00
Neerti
7da5da69eb
Tweaks Lead & Radiation Resistance
2018-02-12 07:10:26 -05:00
Leshana
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
...
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
Andromeda-K22
cee3066a41
RUST additions and updates, Modular guns, and Lead. ( #4667 )
...
* expanding rupture procs
adds hydromagnetic traps for power production.
* Minor tweaks.
* Adds modular guns using research components.
* Updates materials to have a radiation_resistance variable, used in calculating radiation. Adds Lead as a material.
* Un-zeros stock material radiation resistance.
* Adds, and enables four 'end-events' for the RUST in place of the old Rupture() proc.
* Map muckery?
* absolute pathing i guess?
* getting angry, travis.
* TRAVIS
STAHP
* I...
Comments? Lists? Who the hell knows.
2018-02-04 18:04:28 -06:00
Leshana
4f98fad36b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01
...
# Conflicts:
# .travis.yml
# code/_away_mission_tests.dm
# code/modules/admin/verbs/mapping.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z10.png
# nano/images/nanomap_z2.png
# nano/images/nanomap_z3.png
# nano/images/nanomap_z5.png
# nano/images/nanomap_z6.png
2018-02-01 23:55:47 -05:00
Mechoid
e9886625fa
Adds Material Girders ( #4622 )
2018-01-28 18:13:54 -08:00
Arokha Sieyes
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Neerti
96d3d361d0
Adds Boats, Ports /TG/ Buckling ( #4527 )
...
* Adds Boats, Ports /TG/ Buckling
* Travis Appeasement
* Changelog
2018-01-14 14:58:15 -06:00
Mechoid
5efc484595
Makes knives all knives.
2018-01-12 18:02:07 -08:00
Leshana
807f1c7b4b
Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
...
# Conflicts:
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/structures/flora.dm
#
2018-01-09 14:40:09 -05:00
Neerti
42a421e8e1
Adds Bonfires
2018-01-05 02:35:19 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Layne
4d842c6590
Adds snowballs. ( #4414 )
2017-12-07 17:51:36 -06:00
Neerti
7497aef295
work
2017-11-26 12:08:05 -05:00
mistyLuminescence
0d9a175aac
Adds bracelets!
2017-11-17 18:27:35 +00:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
ef735ea89b
Merge pull request #4098 from Neerti/10/15/2017_surface_stuff
...
Touches Up the Surface Somewhat
2017-10-19 09:36:03 -05:00
