New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adds photos and some other stuff to security and medical records #7257
Conversation
Conflicts: code/modules/mob/living/silicon/silicon.dm
literally the only reason required to merge this PR.
:/ not happy with this. |
It's not that ugly of a proc. This seems like a really great thing to have, imo. I've always wanted to be able to get someone's physical appearance from the records somewhere. Maybe now mirrors/surgery will be useful. |
This looks neat.. I'll take a better look though this tomorrow |
if (istype(user.get_active_hand(), /obj/item/weapon/photo)) | ||
var/obj/item/weapon/photo/photo = user.get_active_hand() | ||
return photo.img | ||
if (istype(user, /mob/living/silicon)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think having two istype checks here is bad, when you can get away with just using one.
You mean check for hand only if silicon check failed? That's true.
It only runs at round start currently, but sure. |
/obj/effect/datacore/proc/get_id_photo(var/mob/living/carbon/human/H) | ||
var/icon/photo = null | ||
var/g = (H.gender == FEMALE) ? "f" : "m" | ||
if(!config.mutant_races || H.dna.species.use_skintones) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are all of these species if() checks necessary? Or can there be one initial check in H.dna.species and branch from that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since species can lack hair and such, yeah, I think it's needed.
if("species") | ||
if(active1) | ||
var/t1 = input("Select a species", "Species Selection") as null|anything in roundstart_species | ||
if ((!( t1 ) || !( src.authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || src.active1 != a1)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it too much to ask to replace most of this with usr.canUseTopic(src) and then move the check outside these ifs? (and replace it with a switch or at least else-ifs?)
So I did the cleaning like you asked. Didn't test it yet, only compiled. I'll test it later. Oh and I forgot the "intoxication" thing. |
The manually updated photos are too small, you should be able to reset them and ideally the manual photos would only include the center square. |
The species field isnt filled in by default, and is missing in the security records. NOT MISSING IN SEC RECORDS, i just had lizards turned off in config. E: Only if species is disabled by the server, I think? |
Impressive 👍 |
It was a long time since I worked on it, so I might have forgotten something. @Miauw62 Oh, PDA records don't have any of the new stuff, I tried looking into PDA code and had nightmares. Maybe someday. I also thought of printing photos from records. That may also happen someday. |
Changelog. |
changelog pls and then i'll merge this. |
Delicious 👍 Btw Meow it has a changelog now if you did not check :P |
Adds photos and some other stuff to security and medical records
commit 63456ef Author: phil235 <antoine_hernandez62@hotmail.fr> Date: Sat Feb 7 03:10:32 2015 +0100 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. commit eadf323 Author: phil235 <antoine_hernandez62@hotmail.fr> Date: Fri Feb 6 01:15:58 2015 +0100 Yet more fixes. commit 3456b01 Author: phil235 <antoine_hernandez62@hotmail.fr> Date: Thu Feb 5 23:00:59 2015 +0100 repo update commit e4464b3 Merge: a296e8f 7accea7 Author: phil235 <antoine_hernandez62@hotmail.fr> Date: Thu Feb 5 22:35:00 2015 +0100 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul commit a296e8f Author: phil235 <antoine_hernandez62@hotmail.fr> Date: Thu Feb 5 22:34:11 2015 +0100 Updating the cook book. Finishing giving filling color to growns. More fixes commit 7accea7 Merge: bb188da 9315181 Author: hornygranny <hornygrannytgstation@gmail.com> Date: Thu Feb 5 11:57:22 2015 -0800 Merge pull request tgstation#7554 from paprka/ablightonrobotics Research and different mat requirements for borg upgrades commit bb188da Merge: b936324 ffa0a81 Author: hornygranny <hornygrannytgstation@gmail.com> Date: Thu Feb 5 11:54:23 2015 -0800 Merge pull request tgstation#7490 from Miauw62/sayfix Fixes saycode breaking when the ckey of a ghost was set to null. commit b936324 Merge: f5359ab c9ffb2e Author: Razharas <Razharas@users.noreply.github.com> Date: Thu Feb 5 22:27:35 2015 +0300 Merge pull request tgstation#7471 from Menshin/properly_propelled_sanitization HTML sanitization tweaking commit 0a6013c Author: phil235 <antoine_hernandez62@hotmail.fr> Date: Thu Feb 5 19:53:34 2015 +0100 - Some fixes - Adding power var to microwave to reduce microwaving time (with risk of failure) - Giving unique color to snacks for filling purposes - cake batter and pie dough can also be made with soy milk commit f5359ab Merge: 6fab02e 62938cc Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:45:53 2015 +0100 Merge pull request tgstation#7257 from Lo6a4evskiy/Sec_record_photo Adds photos and some other stuff to security and medical records commit 6fab02e Merge: 574fc61 01bf5b3 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:16:14 2015 +0100 Merge pull request tgstation#7546 from TZK13/Purple-Shorts Adds purple shorts commit 574fc61 Merge: 0c071c5 8400ec9 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:15:28 2015 +0100 Merge pull request tgstation#7543 from TZK13/Work-Boots Adds work boots for engineers commit 0c071c5 Merge: 137f917 e8dd56a Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:14:08 2015 +0100 Merge pull request tgstation#7445 from Deantwo/ChemMasterGetsGloomy ChemMaster Update commit 137f917 Merge: 99b2a08 8d2f4cf Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:12:12 2015 +0100 Merge pull request tgstation#7440 from AlexanderUlanH/bleb Blob Update commit 99b2a08 Merge: 5cb2392 5616f02 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:10:40 2015 +0100 Merge pull request tgstation#7186 from paprka/releaseseq Readds the release sequence for cryogenics and buffs it commit 5cb2392 Merge: 65a3674 e5ceac8 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:09:53 2015 +0100 Merge pull request tgstation#7197 from TZK13/New-Disease-Symptoms Adds three new disease symptoms commit 65a3674 Merge: f5653fa 141baba Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:08:38 2015 +0100 Merge pull request tgstation#7489 from paprka/ghostsa Makes ghosts float up and down ala zero-g commit f5653fa Merge: 15b01a2 48413b4 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:07:52 2015 +0100 Merge pull request tgstation#7500 from Iamgoofball/patch-27 Fixes tgstation#7493 commit 15b01a2 Merge: aa3f6d8 d8e2171 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:05:26 2015 +0100 Merge pull request tgstation#7547 from Menshin/pinpointer_fix Fixes pinpointer runtimes on qdel commit aa3f6d8 Merge: ac60a82 4f618c9 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:05:15 2015 +0100 Merge pull request tgstation#7540 from Delimusca/slimefixins slime feeding hotfix commit ac60a82 Merge: 8a97fb1 2393380 Author: Swag McYolosteinen <gilles.coremans@gmail.com> Date: Thu Feb 5 18:04:54 2015 +0100 Merge pull request tgstation#7536 from Iamgoofball/chemblob fixes my shit commit 62938cc Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Thu Feb 5 20:22:55 2015 +0400 delete-after in changelog commit 416fe43 Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Thu Feb 5 20:18:55 2015 +0400 Added changelog commit faba71f Author: phil235 <antoine_hernandez62@hotmail.fr> Date: Thu Feb 5 16:48:25 2015 +0100 Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay) - converted the microwave recipes to tablecraft recipes - Added customizable food (thanks iamgoofball) - added food ingredients (from baystation) - changing food recipes a bit (replacing stuff with the new food ingredients) - repurpose the microwave to actually cook certain food items. - bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes - Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety. - milk carton is now a condiment bottle - slight buff to vitamin commit 8d2f4cf Author: AlexanderUlanH <ulanlaw@gmail.com> Date: Thu Feb 5 08:43:50 2015 -0500 Changelog Logged changes commit e8dd56a Author: Deantwo <dean@samsig.dk> Date: Thu Feb 5 12:05:12 2015 +0100 Late Fixes - Removed spaces. (such a huge nerf!) - Fixes tgstation#7091 - Fixes two little errors I made on the CondiMaster's UI. - Removes "No pill bottle inserted." from CondiMaster. - Changes the window's default size a little to better suit the changes. commit 9315181 Author: paprka <ddkfjskdjf@gayshit.com> Date: Wed Feb 4 21:43:40 2015 -0800 changelog commit 2393380 Author: Iamgoofball <iamgoofball@gmail.com> Date: Wed Feb 4 18:59:18 2015 -0800 grenades now add up the temperature of contained beakers when mixing commit ce7c2e1 Author: Iamgoofball <iamgoofball@gmail.com> Date: Wed Feb 4 18:55:34 2015 -0800 Changes Spellbook can't open text commit 2098fd5 Author: Iamgoofball <iamgoofball@gmail.com> Date: Wed Feb 4 18:53:33 2015 -0800 Fixes tgstation#7497 commit 26873cd Author: paprka <ddkfjskdjf@gayshit.com> Date: Wed Feb 4 13:12:43 2015 -0800 changes combat requirement to materials commit b7994d7 Author: paprka <ddkfjskdjf@gayshit.com> Date: Wed Feb 4 13:01:05 2015 -0800 research and different mat requirements for borg upgrades commit 50cc057 Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Wed Feb 4 17:35:42 2015 +0400 Lots of fixes and improvements commit d8e2171 Author: Menshin <menshin@users.noreply.github.com> Date: Wed Feb 4 14:26:19 2015 +0100 Fixes pinpointer runtimes on qdel. commit 01bf5b3 Author: TZK13 <Pandemocity@gmail.com> Date: Wed Feb 4 01:23:58 2015 -0600 Adds purple shorts. commit 8400ec9 Author: TZK13 <Pandemocity@gmail.com> Date: Wed Feb 4 00:32:15 2015 -0600 Adds work boots and fixes character setup previews. commit 4f618c9 Author: Delimusca <jinnwarior@gmail.com> Date: Tue Feb 3 22:09:05 2015 -0700 fixed slime drag exploits commit 9a1036d Author: Iamgoofball <iamgoofball@gmail.com> Date: Tue Feb 3 20:26:58 2015 -0800 Fixes tgstation#6991 commit d0b51e8 Author: Iamgoofball <iamgoofball@gmail.com> Date: Tue Feb 3 19:09:18 2015 -0800 fixes tgstation#7154 commit a480ffb Author: Iamgoofball <iamgoofball@gmail.com> Date: Tue Feb 3 17:57:57 2015 -0800 whole lotta bugfixes commit 48413b4 Author: Iamgoofball <iamgoofball@gmail.com> Date: Mon Feb 2 18:35:51 2015 -0800 makes roundstart pills append their reagent number to their name, only roundstart ones do this commit c9ffb2e Author: Menshin <menshin@users.noreply.github.com> Date: Mon Feb 2 00:25:32 2015 +0100 Added _volas_ fix for sanitize_simple infinite loop regarding non standard character stripping commit fbad839 Author: Iamgoofball <iamgoofball@gmail.com> Date: Sun Feb 1 12:26:53 2015 -0800 Fixes tgstation#7493 Fixes tgstation#7493 this also fixes ODing on epi pills commit e5be04e Author: Menshin <overmenshin@yahoo.co.uk> Date: Sun Feb 1 13:12:40 2015 +0100 Cut the message to max_length 'before' sanitizing it, to avoid unnecessary processing commit ffa0a81 Author: Miauw <gilles.coremans@gmail.com> Date: Sun Feb 1 12:44:22 2015 +0100 gotta go fast commit ef3a109 Author: Miauw <gilles.coremans@gmail.com> Date: Sun Feb 1 12:37:49 2015 +0100 Fixes saycode breaking when the ckey of a ghost was set to null. commit 141baba Author: paprka <ddkfjskdjf@gayshit.com> Date: Sun Feb 1 03:37:14 2015 -0800 makes ghosts float up and down commit 4256f3b Author: Menshin <overmenshin@yahoo.co.uk> Date: Sat Jan 31 18:48:17 2015 +0100 * Made the strip_html_properly() proceed the text in one pass * Added stripping everything between http and ://, to prevent links being passed to Byond text window * Stripped an unsafe inputting for advanced diseases commit 044b10e Author: AlexanderUlanH <ulanlaw@gmail.com> Date: Fri Jan 30 14:10:46 2015 -0500 Fixed Typo Very important commit 0fbb343 Author: AlexanderUlanH <ulanlaw@gmail.com> Date: Fri Jan 30 13:47:55 2015 -0500 Reblob A blob bursting in space will cause a random valid crewmember to be infected. They'll have a short time to get to a good location before they burst. This means a lone blob bursting in space will not end the round unless there are no blob-valid crewmembers to choose from. commit 541d0e3 Author: Deantwo <dean@samsig.dk> Date: Fri Jan 30 19:01:29 2015 +0100 Changelog This I think needs a changelog. commit c116488 Author: AlexanderUlanH <ulanlaw@gmail.com> Date: Fri Jan 30 12:17:59 2015 -0500 Makes blob more sensible Gives blobs who burst in space a 30 second warning before they're killed, and informs the admins that it's about to happen. Also changed the round ending logic to use the check_finished proc, rather than building it in to the blobize proc. commit 1b390c1 Author: Deantwo <dean@samsig.dk> Date: Fri Jan 30 18:10:59 2015 +0100 Reverted Finite Bottles Also removed "g_amt" from bottle.dm and condiment.dm again. commit 38dbcaa Author: AlexanderUlanH <ulanlaw@gmail.com> Date: Fri Jan 30 00:05:04 2015 -0500 Blob Update Blobs' bursting on solars makes a log and an admin message, and will end the round if the blob bursting was the last remaining blob. Feedback on the specifics of the admin logging/messaging is welcome. commit 588b79f Author: Deantwo <dean@samsig.dk> Date: Fri Jan 30 03:21:44 2015 +0100 ChemMaster UI Update 2 - Can now disspense bottles/condiments without inserting a beaker. - Glass is now used when creating bottles. Glass can be refilled with sheets of glass. Can store enough for glass for 40 bottles or 16 condiments, but starts with only half that. - Custom amount transfers now have a cancel button too. - Many many minor changes. Other: - Added "g_amt = 200" to bottle. - Added "g_amt = 500" to condiment. commit fdc3f66 Merge: f7659eb c369304 Author: Deantwo <dean@samsig.dk> Date: Thu Jan 29 21:11:49 2015 +0100 Merge branch 'GloomyChemMaster' into ChemMasterGetsGloomy commit c369304 Author: Deantwo <dean@samsig.dk> Date: Thu Jan 29 21:11:32 2015 +0100 ChemMaster UI Update - Analyze refactored for readability. - Pill bottles can no longer be inserted into a CondiMaster. - Main UI updated to the station standard along with some nice changes. commit c33992f Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Sun Jan 25 00:04:50 2015 +0400 Code cleanup commit bfd7468 Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Sat Jan 24 16:14:44 2015 +0400 Tweaks as noted, added myself to admins.txt commit e5ceac8 Author: TZK13 <Pandemocity@gmail.com> Date: Thu Jan 22 20:35:52 2015 -0600 Lowers both skin symptoms from level 5 to 4. commit c6a1341 Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Wed Jan 21 22:09:52 2015 +0400 Compile, you damn dirty code commit 146414e Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Wed Jan 21 21:42:43 2015 +0400 Reinclude some stuff in .dme commit 21773c0 Merge: 3619ed4 11f3717 Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Wed Jan 21 21:40:14 2015 +0400 Merge branch 'master' into Sec_record_photo commit 3619ed4 Merge: a22d1ec 19c1e8b Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Wed Jan 21 21:26:46 2015 +0400 Merge branch 'master' into Sec_record_photo Conflicts: code/modules/mob/living/silicon/silicon.dm commit a22d1ec Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Wed Jan 21 21:21:47 2015 +0400 Adds photos and species to security and medical records, plus some other tweaking commit 81983af Author: TZK13 <Pandemocity@gmail.com> Date: Tue Jan 20 01:25:54 2015 -0600 Updated changelog. commit adf0544 Author: TZK13 <Pandemocity@gmail.com> Date: Tue Jan 20 00:01:12 2015 -0600 Adds another new symptom and combines both vision symptoms. commit 03a1b0a Author: TZK13 <Pandemocity@gmail.com> Date: Mon Jan 19 09:15:40 2015 -0600 Changelog. commit fbe4194 Author: TZK13 <Pandemocity@gmail.com> Date: Mon Jan 19 08:41:52 2015 -0600 Adds two new disease symptoms. commit 5616f02 Author: paprka <ddkfjskdjf@gayshit.com> Date: Sun Jan 18 22:30:24 2015 -0800 readds the release sequence for cryogenics commit bebee8d Author: Lo6a4evskiy <Lo6a4evskiy@gmail.com> Date: Wed Jan 14 16:08:53 2015 +0400 First iteration
Adds photos and some other stuff to security and medical records
I may post some screenshots tomorrow.