Razgriz
|
9656b7c18a
|
Notification change for welderbombing
Instead of saying gaypwnd, it says you are doomed when welderbombing.
|
2019-12-29 14:25:49 -07:00 |
|
Hawk_v3
|
0f3c802427
|
Merge remote-tracking branch 'upstream/master'
|
2019-08-22 21:32:01 +01:00 |
|
Mechoid
|
ae48659a68
|
Exploration Expansion 1: Or, How I Learned To Love The Tree
|
2019-08-21 17:23:07 -04:00 |
|
Hawk_v3
|
50e2482613
|
Merge remote-tracking branch 'upstream/master'
|
2019-04-22 20:12:14 +01:00 |
|
Neerti
|
197bedb2eb
|
Merge pull request #6086 from Heroman3003/welder-fires
Fixes self-refueling welders starting fires when off
|
2019-04-15 18:31:37 -04:00 |
|
Hawk_v3
|
41f0bd9f6d
|
Merge remote-tracking branch 'upstream/master'
|
2019-04-14 19:44:13 +01:00 |
|
Neerti
|
9c28b82c6c
|
Merge pull request #6028 from Mechoid/Precursotech_Tools
Precursotech Tools
|
2019-04-14 02:20:07 -04:00 |
|
Repede
|
e4dd365fe1
|
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
|
2019-04-07 19:40:12 -04:00 |
|
Neerti
|
f8c9664178
|
Explorer Update - Cataloguers
|
2019-03-30 16:19:24 -04:00 |
|
Unknown
|
baffac60fc
|
Lynx Fixes Runtimes
There are still a couple of remaining runtimes...
|
2019-03-28 23:50:37 -04:00 |
|
Neerti
|
30b967e28a
|
Items are now assumed to be conductive, rather than the opposite
|
2019-03-28 21:45:38 -04:00 |
|
Unknown
|
ec19a66eff
|
Conflict Resolution
|
2019-03-27 16:36:41 -04:00 |
|
kevinz000
|
6415e4193f
|
[READY]Makes a bunch of processes subsystems instead
|
2019-03-27 16:03:51 -04:00 |
|
Unknown
|
03dcb65c01
|
Fixes most of the issues
|
2019-03-27 00:38:44 -04:00 |
|
Neerti
|
86174593bf
|
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
|
2019-03-26 23:58:26 -04:00 |
|
Unknown
|
85be5a9166
|
[5654] Resolves Merge Error
"But I wanted to play Hearts of Iron..."
"NO."
|
2019-03-01 23:58:05 -05:00 |
|
Spades
|
6e2172a5ae
|
Merge branch 'master' into upstream-merge-5654
|
2019-03-01 05:42:07 -05:00 |
|
Unknown
|
a4317b1910
|
[5654] Makes this PR Compile
This one made me cry.
|
2019-02-23 12:30:16 -05:00 |
|
Spades
|
1338225afa
|
Resolves some merge conflicts
|
2019-01-05 16:29:19 -05:00 |
|
kevinz000
|
fc178c1e04
|
Makes math helpers defines for performance
|
2018-12-06 16:15:00 -05:00 |
|
Atermonera
|
2df5e9fe0e
|
Merges AI Branch into Master
|
2018-12-01 00:06:38 -05:00 |
|
Repede
|
f7b9137b75
|
Removes weldertank explosion memes
|
2018-10-27 20:20:05 -04:00 |
|
Spades
|
f379ea2df4
|
Update weldingtool.dm
|
2018-10-07 17:55:35 -04:00 |
|
Spades
|
b1b565c352
|
Update weldingtool.dm
|
2018-10-07 17:55:01 -04:00 |
|
Spades
|
91a67b6b37
|
Update weldingtool.dm
|
2018-10-07 17:54:35 -04:00 |
|
Atermonera
|
fafd85957f
|
Minor issues fix.
|
2018-10-06 01:17:19 -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 |
|
Anewbe
|
64562eddba
|
FBPs can have brute damage repaired externally again
|
2018-08-10 17:06:39 -05:00 |
|
Anewbe
|
7f84aeab9f
|
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool
|
2018-08-02 22:35:14 -05:00 |
|
Anewbe
|
729ce71aa0
|
Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format
|
2018-08-02 21:45:15 -05:00 |
|