Commit Graph
17034 Commits
Author SHA1 Message Date
Tad Hardesty 1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08:00
tigercat2000 add4852d3c Remove purple rose properly 2018-03-06 04:46:17 -08:00
RegenandGitHub ff68c12b31 Removes purple hair flower pin
Removes the purple hair flower pin, as this is my fluff item.

@Tigercat2000 is moving the sprite to the correct folder then he's available.

:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
2018-03-06 01:36:10 +01:00
Funce 27d3ccbe10 Allow silicons to properly use interface lock UI. 2018-03-05 11:48:40 +13:00
Fox McCloudandGitHub e1003f0d83 Merge pull request #8489 from KasparoVy/eyeglow
Eyes of Humanoids w/ Great Darkview, XRAY Vision, Synthetic Eyes or Eye Implants Shine in the Dark
2018-03-03 17:20:52 -05:00
tigercat2000andGitHub 693e188362 Merge pull request #8583 from FalseIncarnate/coffee
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
FalseIncarnate 3b37c1c48c datum path rename 2018-03-03 13:19:58 -05:00
tigercat2000andGitHub 2887c4a62f Merge pull request #8710 from Birdtalon/pschye-toys
A few more things for the Psyche locker.
2018-03-03 09:59:40 -08:00
tigercat2000andGitHub 65f0895b64 Merge pull request #8693 from Aurorablade/NecaWTF
Why Neca
2018-03-03 09:59:22 -08:00
tigercat2000andGitHub d92616c948 Merge pull request #8660 from Tayyyyyyy/ai_status
Port tg AI status panel
2018-03-03 09:59:06 -08:00
tigercat2000andGitHub aca2769324 Merge pull request #8681 from DarkPyrolord/BluespaceSlices
Fixes bluespace bread (and other slice foods as well)
2018-03-03 09:30:23 -08:00
tigercat2000andGitHub 087457fa9b Merge pull request #8675 from Serkket/001
Bug-B-Gone
2018-03-03 09:28:12 -08:00
Citinited 8d559ab9b3 fixes posibrains going to nullspace after losing at russian roulette 2018-03-02 21:44:58 +00:00
Citinited c6cc30ff8c Fixes a runtime that can be caused by headless IPCs 2018-03-02 21:39:48 +00:00
FalseIncarnate 060117f5c3 novelty datums 2018-02-28 22:13:38 -05:00
tigercat2000andGitHub b8b5795636 Merge pull request #8704 from Aurorablade/SkrellHair
New hair for Skrell and one for Taja
2018-02-24 19:19:23 -08:00
Birdtalon 904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
Aurorablade 86f25c5e7f fixes some words... 2018-02-21 23:31:43 -05:00
Fox McCloudandGitHub 010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral
Titanium
2018-02-21 03:20:20 -05:00
Aurorablade 63537a050b new hair 2018-02-21 01:36:17 -05:00
uraniummeltdown edda7c9c52 make power tools and abductor tools use titanium 2018-02-21 11:09:47 +05:00
Fox McCloudandGitHub d028ad1ee9 Merge pull request #8314 from Anasari/FireFight
Port Paper Plane
2018-02-20 21:12:21 -05:00
Ansari 1e0a4645db fix 2018-02-21 08:28:26 +08:00
DarkPyrolord 2b2bedee9b Tired code is shitcode 2018-02-21 13:11:27 +13:00
DarkPyrolord ddf32096f0 I should get more sleep 2018-02-21 01:05:33 +13:00
Ansari 0acc32b103 Finally 2018-02-20 19:47:09 +08:00
Fox McCloudandGitHub 6c7ab652a2 Merge pull request #8667 from Birdtalon/papertime
Time tag for paperwork
2018-02-20 06:00:11 -05:00
DarkPyrolord 0f8533ea18 Tiger Fixes 2018-02-20 22:34:45 +13:00
Fox McCloudandGitHub e4678d1a9f Merge pull request #8568 from MarcellusPye/SulphAcidNoMore
Lets grays drink sulphuric acid
2018-02-20 04:16:11 -05:00
Ansari b3968ce180 woops 2018-02-20 16:11:42 +08:00
Ansari bcdc6af7f1 Fixes 2018-02-20 16:08:49 +08:00
MarcellusPye a426b93a7a Maintainer corrected comments 2018-02-20 19:45:57 +13:00
MarcellusPye 8235d8ec89 Calls parent 2018-02-20 19:38:55 +13:00
tigercat2000andGitHub f73c3c01d8 Merge pull request #8418 from Fox-McCloud/disco-inferno
Adds Dance Machine
2018-02-19 22:04:01 -08:00
Fox McCloudandGitHub 0f0f7e13c6 Merge pull request #8444 from HugoLuman/whalecough
Adds coughing and sneezing sounds for Drask
2018-02-20 00:48:09 -05:00
tigercat2000andGitHub ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff
Buffs IEDs
2018-02-19 21:45:05 -08:00
Aurorablade 17bf70cb36 reduces volume to 70 2018-02-18 20:04:13 -05:00
Aurorablade e38552b3a2 no really 2018-02-16 20:27:37 -05:00
florodude 4376f8f974 fixes #8680
Changed frabricated to fabricated.
2018-02-15 00:05:36 -06:00
DarkPyrolord fb5d048dbd Bluespace B Gone 2018-02-14 02:29:39 +13:00
Crazy LemonandGitHub 8979e2428d Merge pull request #8410 from tigercat2000/client_dir
Client dir compatibility, part 1
2018-02-11 16:40:44 -08:00
Serket 8930359edc MapMerge/SpeciesCheck 2018-02-11 16:03:27 -07:00
Serket 00d501c7df BugBGone 2018-02-10 12:26:30 -07:00
Fox McCloudandGitHub 571f86c7f0 Merge pull request #8277 from Aurorablade/DisMemberments
Adds to Dismemberment slightly
2018-02-10 00:27:12 -05:00
KasparoVy 8ef309eb87 I figured there was a better way to do this.
Refactors eyecon generation and eye-shine.

Synthetic eyes and cyber-eye implants will now trigger eye-shine.
2018-02-09 23:52:50 -05:00
Aurorablade 37f2b8f010 Allows castration 2018-02-09 20:18:04 -05:00
KasparoVy 541b4f7275 Readability & Abstraction Improvements + A Tweak
As per Tigercat's review, readability has been improved and the method
by which eyeshine is applied has been abstracted a lot more.

As part of that, I have divised a solution for the situation where,
prior to this tweak, if you were a Tajara and had the 'bangs' hairstyle
while also having eyeshine, one of your eyes would render ABOVE your
hair.

Now, despite the eye shine happening on a higher layer, the eye that
would ordinarily be hidden by the hair still is.
How? By cutting the pixels that are overlapped by the hair from the eye
icon during rendering.
2018-02-09 20:12:31 -05:00
KasparoVy 64ced9f6b6 Shiny, not Glowy
Terminology tweak.
2018-02-09 20:12:31 -05:00
KasparoVy 5053b2aa74 Adds "Eye-Glow" for Humanoids w/ High Darksight or XRAY Vision 2018-02-09 20:12:30 -05:00
tigercat2000andGitHub bd50420a50 Merge pull request #8664 from RyanSmake/muhspessnamez
We don't need 5 separate variables to know which station we are on, take two
2018-02-09 13:18:22 -08:00