Commit Graph

22503 Commits

Author SHA1 Message Date
KasparoVy
b497aafb90 Darkens Unathi Horns/Spines/Frills, Adds Secondary Facial Hair Colours/Support, Further Adjustment to Tigerhead/TigerheadFace Sprites
You can now colour the webbing of webbed Unathi frills independently.
Morph and CMA support has been included.
Splits tigerhead sprites into 3 versions in order to better fit the
different ears of the three species that can use it.
2016-07-19 05:58:50 -04:00
KasparoVy
b38e8ea190 Removes Redundant "None" Vulpkanin Hairstyle
Going to need the following query run on the SQL database:

UPDATE `characters` SET `hair_style_name` = "Bald" WHERE
`hair_style_name` = "None";
2016-07-18 20:23:27 -04:00
KasparoVy
b84a941488 Adds Tajaran Nose marking, Doubles up Ear Stuff for added Customization, Fixes Alt Head Prefs Bug + More Sanity, Refactors Morph Again, ....
Adds 5 more Tajaran hair styles, sprites from Polaris and fixes an issue
where Tajara and Vulpkanin couldn't be bald in character preferences.

The alt head prefs bug became prevalent if you spammed the 'reload slot'
button on certain characters. They'd get an alt head and if you switched
slots it wouldn't go away-- breaking head icon generation. Woops. Not a
problem anymore because the var isn't initialized to null and is
corrected in the prefs screen. Also refactors the morph ability to use
the change_whatever procs from appearance.dm. Removes redundant
update_body from force_update_limbs.
2016-07-18 20:11:01 -04:00
KasparoVy
09ce5808ca Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-18 16:05:24 -04:00
TheDZD
5c29bf3a64 Merge pull request #5074 from Fox-McCloud/adminbus-reagent
Tweaks Adminordrazine, Cleans up Reagents, Fixes body temperature adjustments, and makes a few tweaks
2016-07-18 14:41:45 -04:00
KasparoVy
35619f62e2 Adds Vulpkanin Markings, Adds Vulp/Unathi/Human Hairstyle, Fixes Vulp Default Colour, Corrects Typos in Sprite_accessories, Darkens Vulpkanin Facial Hair
Expanding on the above: Adds Vulpkanin nose and chest crest markings.
Adds Vulpkanin braided hairstyle (Tajaran Braid ripoff) and hippie braid
for Humans/Unathi (also a Tajaran Braid ripoff).
2016-07-18 04:37:56 -04:00
KasparoVy
0a0627d12d Darkens Vulpkanin 2016-07-18 03:00:14 -04:00
KasparoVy
00558bd109 Adds Vox-fitted Hydroponic HUD (nightvision version incl.) (#5082) 2016-07-18 01:57:53 -04:00
Allfd
77f3dd7953 Add AI hologram fluff (#5067)
* Add AI hologram fluff

Extends custom_sprites.txt to enable custom holograms for the AI by
adding a third entry “Hologram”.  This will enable hologram fluff for
the AI.

:cl:Allfd
rscadd: Added hologram fluff sprites
/🆑

* Removed ;
2016-07-17 22:53:57 -04:00
Fox McCloud
f2010d590b Merge pull request #5044 from Kyep/select_equipment_improvements
Improves the admin 'select equipment' verb
2016-07-17 21:45:06 -04:00
LittleBigKid2000
d268c1d6d0 Stethoscope fixes and additions (#5015)
* Stethoscope fixes and additions

Now with less ❄️. At least, the species ❄️ kind.

- Stethoscopes now check for a heart and lungs. If the target doesn't
have either, the user won't hear anything. Sure, this means the user
will still hear a pulse if the target just has lungs and vice versa, but
you'll probably be dead or have microbattery or something if you don't
have both.
- Using the stethoscope on yourself will display a message that uses
'your' instead of 'his' or 'her'.
- Using a stethoscope on someone will tell the user if the target is
having a heart attack ("hear an irregular pulse and respiration")
- The messages displayed will properly use 'the'. ("[user] places the
stethoscope" instead of "[user] places stethoscope")

I don't know why I'm bothering with this, no one uses stethoscopes for a
good reason.

* (Hopefully) fixes the same message for lungs but no heart. Also reduces the oxyloss threshold thing. I probably did this very wrong.

* Tully got salty because I stole his PR, so we collaborated

* Rewrites the code to be less shit, probably
2016-07-17 21:43:51 -04:00
TheDZD
4c2ee0c40a Merge pull request #5062 from Fox-McCloud/pda-scanning-vending
Can Scan Vending Machines with your PDA
2016-07-17 21:41:49 -04:00
KasparoVy
005066d891 Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-17 19:25:03 -04:00
KasparoVy
710c722535 Tidies up and Finalizes Alt Heads, adding Morph + CMA support + more...
Another parameter has been added to the update_body proc that allows you
to force the regeneration of limb icons. Absolutely crucial to alt_heads
as, without this functionality, you would never be able to change the
head after you spawned via Morph or CMA among other issues.
2016-07-17 19:23:41 -04:00
Fox McCloud
91d5032a86 Merge pull request #5083 from Kyep/objective_fix
Prevents objectives targeting clientless mobs
2016-07-17 13:49:18 -04:00
TheDZD
ab84df2934 Merge pull request #5071 from Fox-McCloud/sleeper-changes
Sleeper Changes
2016-07-17 13:23:51 -04:00
TheDZD
5cab6375db Merge pull request #5084 from Fox-McCloud/rig-fix
Fixes Shielded, HoS, and Syndi Rig Sprites
2016-07-17 13:23:09 -04:00
Krausus
84e0bf3a12 Fixes admin log runtime
message_admins is sometimes used for warnings during creation of a
client's preferences datum, which means it can get called while an
admin's prefs doesn't exist
2016-07-17 08:12:41 -04:00
Fox-McCloud
4d40c32f70 more tweaks and optimizations 2016-07-17 07:07:58 -04:00
Fox-McCloud
54f3f9d207 Fixes Shields and Syndi Rigs 2016-07-17 06:14:26 -04:00
KasparoVy
8f642828ce Alt head tweaks
Todo: CMA/morph support for alt heads.
Known issues: Can't change alt head on the fly, icon won't update
properly
2016-07-17 05:12:37 -04:00
Fox-McCloud
2710eeff5f less copy-pasta, better sprinkles, and vitamins 2016-07-17 04:06:23 -04:00
Fox-McCloud
db297e027f more cleanup 2016-07-17 02:24:14 -04:00
Fox-McCloud
7bdf89e37c Merge remote-tracking branch 'upstream/master' into sleeper-changes 2016-07-17 01:34:43 -04:00
Fox-McCloud
f0b8d3b097 more cleanup 2016-07-17 00:44:58 -04:00
Fox McCloud
d8b975e18a Merge pull request #5065 from Krausus/AdminLogTweaks
Admin Log Tweaks: Trialmin Visibility, Toggling, Spam Reduction
2016-07-16 23:42:43 -04:00
Fox McCloud
9c2bce6cbb Merge pull request #5079 from LittleBigKid2000/don't-cry-don't-raise-your-eye-it's-only-nuclear-wasteland
Fixes nucleation eyes not having health and always being dead
2016-07-16 23:41:42 -04:00
Fox-McCloud
7dccd3cedc fixes 2016-07-16 23:40:43 -04:00
Kyep
2f66464726 Prevents objectives targeting clientless mobs
Fixes bug where clientless mobs (e.g: gateway NPCs) can be made into
objective targets.
2016-07-16 20:21:12 -07:00
Fox-McCloud
a4619fbd38 clean up 2016-07-16 23:11:32 -04:00
KasparoVy
478b69a183 Tidies up collar code. 2016-07-16 22:23:48 -04:00
Isaac Erwin
0447c747c8 Fixes nucleation eyes not having health and always being dead 2016-07-16 17:50:09 -04:00
Fox-McCloud
d9d933224b tweaks and fixes 2016-07-16 14:09:46 -04:00
TheDZD
68e26f3176 Merge pull request #5045 from Fox-McCloud/tg-weather
Ports TG's Weather System
2016-07-16 12:04:17 -04:00
Fox-McCloud
e98c8978bd aesthetic lava 2016-07-16 11:54:43 -04:00
Fox McCloud
0653bff9c5 Merge pull request #4965 from TullyBurnalot/RemoteViewFix
Remote View Bug Fix
2016-07-16 11:40:14 -04:00
Fox McCloud
cb0973346b Merge pull request #4766 from Kyep/parole
Parole
2016-07-16 11:35:37 -04:00
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
TheDZD
9bf946b5b6 Merge pull request #5054 from Fox-McCloud/mining-tweaks
Various Mining Tweaks
2016-07-16 10:57:54 -04:00
Fox McCloud
ac9a94bcb1 Merge pull request #5063 from FlattestGuitar/coats
Fixes some problems with the loadout system, changes costs a bit.
2016-07-16 10:46:52 -04:00
TheDZD
0d51787dbb Merge pull request #5072 from Fox-McCloud/belt-fixes
Belt Overlay Fixes
2016-07-16 10:44:01 -04:00
Fox McCloud
744777a944 Merge pull request #4971 from monster860/datum_browserify
Makes a bunch of UI's use /datum/browser
2016-07-16 08:52:18 -04:00
monster860
e32418956e open(0) 2016-07-16 08:27:37 -04:00
Kyep
ab06e73fdf Fixes conflict with explosives PR 2016-07-16 02:59:19 -07:00
Mieszko Jędrzejczak
9cfb9c780d Removes errors, errors. 2016-07-16 10:54:41 +02:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun
Plastic Explosives Update
2016-07-16 04:07:12 -04:00
Fox-McCloud
b8f13dd693 Tweaks Adminordrazine 2016-07-16 02:50:32 -04:00
Fox-McCloud
7751adcffc Belt Overlay Fixes 2016-07-16 02:06:02 -04:00
Fox-McCloud
a1341f02af Sleeper Changes 2016-07-16 01:31:34 -04:00
KasparoVy
b274703a18 Adds Alt Heads
known issues: no CMA support for changing alt heads
cant change alt head after you spawn in

To do: Finish unathi sharp snout lower marking
2016-07-16 00:10:42 -04:00