Unknown
cf39c61c2d
Conflict Resolution
...
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Neerti
3256202407
[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
2019-03-27 22:02:07 -04:00
Atermonera
cbf66a9b0b
Merge pull request #5894 from Neerti/pun_pun_fix
...
Fixes Some Mob Init Bugs
2019-03-27 20:42:50 -04:00
Neerti
fe0b7373b3
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
kevinz000
dfbd0bd72b
Upgrades SDQL2 and refactors it to a datum
2019-03-27 11:50:49 -04:00
Anewbe
09b01407e3
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -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
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Anewbe
e4660c5838
Admin ticket system (for real this time)
2018-10-09 16:31:01 -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
Atermonera
f776cc0513
Merge pull request #5517 from Anewbe/hud_invis
...
Low alpha now makes HUDs and tooltips not show up on you
2018-08-24 15:47:22 -07:00
Anewbe
e8c9a44fbc
Low alpha now makes HUDs and tooltips not show up on you
2018-08-22 18:00:10 -05:00
Anewbe
eebb627f00
Partially ports the GLOB system
2018-08-14 18:14:09 -05:00
Arokha Sieyes
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
Atermonera
37047ff895
typo ( #5266 )
...
* typo
* Update mob.dm
2018-05-16 19:27:23 -05:00
Arokha Sieyes
dfd07209b6
POLARIS: MouseDown closes tooltips too
2018-03-20 22:42:24 -04:00
Arokha Sieyes
0da7f73641
POLARIS: Rename make_nametag_name/desc
2018-03-20 22:42:23 -04:00
Arokha Sieyes
de6da4a86c
POLARIS: Tooltip framework, and mob tooltips
2018-03-20 22:42:16 -04:00
Arokha Sieyes
8b647cce73
VS: Fix various screams and emotes in bellies
2018-03-18 20:36:00 -04:00
Arokha Sieyes
7cc6208e0b
POLARIS: MouseDown closes tooltips too
2018-03-18 00:19:36 -04:00
Leshana
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.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-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
Arokha Sieyes
13f506ba60
POLARIS: Rename make_nametag_name/desc
2018-03-12 20:25:36 -04:00
Arokha Sieyes
428db6c271
POLARIS: Tooltip framework, and mob tooltips
2018-03-12 18:25:53 -04:00
Arokha Sieyes
53a185f838
U_I Phase 2.0: Code cleanup
...
Removing calls to update_icons_layers and the like, stubbing them to help track down future calls.
2018-03-08 19:33:44 -05: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
Atermonera
61ca538e06
Merge pull request #4929 from Anewbe/splints
...
Splints no longer perfectly prevent negative effects from broken bones
2018-02-24 22:52:25 -08:00
Leshana
4ebbf1ce7a
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24
...
# Conflicts:
# maps/southern_cross/southern_cross-1.dmm
2018-02-24 13:19:10 -05:00
BillyBangles
475d250d6a
adds slippery ice tiles ( #4935 )
2018-02-24 11:04:58 -06:00
Anewbe
af62498e28
Progress
2018-02-22 19:49:30 -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
Arokha Sieyes
e248b89b7b
POLARIS: Player-controlled SA QOL
2018-02-15 01:49:53 -06:00
Arokha Sieyes
5c08ee7a2a
POLARIS: Simple Animal Player QOL
...
Adds a HUD when controlling a simple animal. Allows intents, mostly harm and help if they don't have hands. Disarm and grab if they do. Gives them a generic hud, and adds a var to decide if they have hands or not. Adds a var printed to any client that joins into a mob to explain how to play them, or lore stuff, or whatever you feel like.
2018-02-15 01:15:22 -06:00
Cameron653
e128afbd17
Fixes Typing Indicator ( #4773 )
...
* Fixes text indicator. Works on getting the chat bar to work.
* Getting the text bar to show the typing indicator proved to be impossible.
Seeing as it was cut out 3 years ago for being absolutely broke, I snipped it out of the code.
* Makes the indicator work better
2018-02-10 18:16:17 -06: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
MarinaGryphon
72318d46b6
Replaces most of the gender macros. ( #4681 )
...
* Fixes #4632 .
* 1:27 am coding best coding
* fixes a warning
* Removes the last of the gender macros. Gender is dead.
* gender II: the travis-ing
* linebreaks are dead too.
* oops i accidentally the gender, also ambiguous gender is now taken into account for get_visible_gender
2018-02-03 14:40:09 -06:00
Aronai Sieyes
47758a0453
POLARIS: Allow admins to see say/emote near their own body while they are aghosted. ( #4663 )
2018-01-29 11:47:08 -08:00
Arokha Sieyes
4645f5d182
POLARIS: Allow admins to see say/emote near their own body while they are aghosted.
2018-01-28 02:56:59 -05:00
Arokha Sieyes
1558cd47df
3 Fixes ( #4600 )
...
* POLARIS: Do this lazily
* POLARIS: Speed up visible_message and audible_message
* POLARIS: Destroy this list rather than cutting it, for future safety
2018-01-21 16:17:04 -06:00
Arokha Sieyes
b7f1c41581
POLARIS: Speed up visible_message and audible_message
2018-01-20 22:08:37 -05:00
Arokha Sieyes
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
Arokha Sieyes
f2fef6f410
Planes Framework ( #4545 )
...
* Polaris initial plane upstream merge
* POLARIS: Fix RIG visors with new plane system, and material scanner VIS_FULLBRIGHT
* POLARIS: Fix GetFlatIcon so that cameras and id pictures don't show the HUD overlays.
* POLARIS: Adds a 'alter values' proc for plane master ease of tweaking
Setting stuff like colorblindness variety and things.
* Remove NIF reference, fix lighting layer define
* Handle effects above lighting plane
* Moved all layer defines to planes+layers.dm
* Fixed overlays that are supposed to be above lighting to use the PLANE_LIGHTING_ABOVE
* Merge: 3000% human/update_icons() speed improvement
* Merge: Avoid ghosts pointing at things
2018-01-17 13:45:54 -06:00
Leshana
afd37c32db
POLARIS: Fix regular mobs seeing when ghosts point at things.
...
* Fixed it by adding a facility by which code can check if a mob can logically see things present on another plane.
2018-01-16 20:04:57 -05:00
Arokha Sieyes
73d91610f0
POLARIS: Hide higher planes from alt-turf menu
...
Hides things from higher planes in the alt-examine menu. Too spooky! Fixes #2749
2018-01-14 22:22:20 -05:00
Arokha Sieyes
ad74dec1c0
POLARIS: Planes shenanigans. Begins 'plane' work.
2018-01-14 00:39:59 -05:00
Neerti
cca2cc5a23
Adds Berserk
2018-01-11 01:35:14 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Anewbe
a8e3dd4d1b
Merge pull request #4365 from Neerti/11/27/2017_wild_slimes
...
Adds a Wild Slime type for future surface-things.
2017-11-29 12:50:25 -06:00
Neerti
a66482de75
Adds a Wild Slime type for future surface-things.
2017-11-28 02:05:37 -05:00
Anewbe
1d9af61ff0
Adds a cap to losebreath
2017-11-26 21:55:55 -06:00
killer653
da0bf3743b
Polaris sync
2017-11-17 19:27:03 -05:00
