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
37047ff895
typo ( #5266 )
...
* typo
* Update mob.dm
2018-05-16 19:27:23 -05:00
dfd07209b6
POLARIS: MouseDown closes tooltips too
2018-03-20 22:42:24 -04:00
0da7f73641
POLARIS: Rename make_nametag_name/desc
2018-03-20 22:42:23 -04:00
de6da4a86c
POLARIS: Tooltip framework, and mob tooltips
2018-03-20 22:42:16 -04:00
8b647cce73
VS: Fix various screams and emotes in bellies
2018-03-18 20:36:00 -04:00
7cc6208e0b
POLARIS: MouseDown closes tooltips too
2018-03-18 00:19:36 -04:00
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
13f506ba60
POLARIS: Rename make_nametag_name/desc
2018-03-12 20:25:36 -04:00
428db6c271
POLARIS: Tooltip framework, and mob tooltips
2018-03-12 18:25:53 -04:00
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
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
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
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
475d250d6a
adds slippery ice tiles ( #4935 )
2018-02-24 11:04:58 -06:00
af62498e28
Progress
2018-02-22 19:49:30 -06:00
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
e248b89b7b
POLARIS: Player-controlled SA QOL
2018-02-15 01:49:53 -06:00
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
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
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
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
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
4645f5d182
POLARIS: Allow admins to see say/emote near their own body while they are aghosted.
2018-01-28 02:56:59 -05:00
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
b7f1c41581
POLARIS: Speed up visible_message and audible_message
2018-01-20 22:08:37 -05:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
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
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
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
ad74dec1c0
POLARIS: Planes shenanigans. Begins 'plane' work.
2018-01-14 00:39:59 -05:00
cca2cc5a23
Adds Berserk
2018-01-11 01:35:14 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
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
a66482de75
Adds a Wild Slime type for future surface-things.
2017-11-28 02:05:37 -05:00
1d9af61ff0
Adds a cap to losebreath
2017-11-26 21:55:55 -06:00
da0bf3743b
Polaris sync
2017-11-17 19:27:03 -05:00
ee8f3ffbce
MouseDrop checks incapacitated() before giving inventory access
2017-11-13 23:46:11 -08:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
860c1d2e9f
Makes the auto-antag-record logging for loadout items prettier
2017-10-02 03:08:01 -05:00
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
e158fcd3cc
Macro Replacements. ( #3574 )
...
* A preface to my madness
Travis failed one of my PR's because I copied old code
that used /red /blue /green.
Because of this, I am going to find and replace every
instance of it that I find.
Also this is a test commit to make sure I'm comitting
to the correct branch.
* /blue /green /red replacements
Dear god.
A slow and painful death from acid is more fun than this.
I wouldn't wish this torture on my worst enemy.
And this is only the beginning
* Replace part 2.
Time to fix the human error.
* Fixes mismatches
* Sets macro count to 220
One above the current number of macros in the code.
* Fixes last of the mismatches.
* Removes spaces, replaces \black
Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen
* Updating macro count again
* More fixes!
* Issues fixed! For real this time!
I swear!
* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
7b47590645
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
...
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
69a50ec225
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609
...
# Conflicts:
# code/_macros.dm
# code/controllers/master_controller.dm
# vorestation.dme
2017-06-09 22:54:16 -04:00
ebe5cc916d
Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
...
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
b17fb86721
Tweaks Statpanel and System Initialization
2017-06-01 21:42:08 -04:00
055c998f82
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/integrated_electronics/subtypes/reagents.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/organs/organ_external.dm
# code/modules/ventcrawl/ventcrawl.dm
# html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
ea6128f986
Adds Modifier System, Changes Some Ling Stuff
...
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc. The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
2e59e24dca
Merge branch 'master' of ../Polaris into polaris-sync
2017-04-16 20:58:40 -04:00
69a8d84344
Fixes a few errors.
2017-04-11 00:39:21 -07:00
Arokha Sieyes