Commit Graph

1625 Commits

Author SHA1 Message Date
Robertha89
dba3a8d937 Fixes issue 2016-02-07 19:40:19 +01:00
Robertha89
8accdb52db add tesla to supplypacks 2016-02-07 19:27:22 +01:00
Fox-McCloud
a64e95104e Removes Mindswap Suiciding 2016-02-05 22:30:43 -05:00
Fox McCloud
b30a0dfacb Merge pull request #3441 from Crazylemon64/squishy_hair
Squishy Slime Hair Woooooo
2016-02-02 21:14:54 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Crazylemon64
945dbe0f0e Woo everything's done 2016-02-01 09:19:05 -08:00
TheDZD
f12e56cd69 Merge pull request #3445 from Fox-McCloud/summon-guns
Updates Summon Guns
2016-01-31 18:44:12 -05:00
Tastyfish
ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -05:00
Fox-McCloud
9ff52f91a8 Updates Summon Guns 2016-01-29 22:54:07 -05:00
Fox-McCloud
887ce1f37e fixes blind spell 2016-01-29 21:31:16 -05:00
Fox-McCloud
1404d66fff tweaks 2016-01-29 19:40:46 -05:00
Fox-McCloud
1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Fox-McCloud
7a29f1c0da runtime fix 2016-01-28 20:27:05 -05:00
Fox-McCloud
cfa857cd35 Adds in Lichdom Spell 2016-01-28 18:57:00 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Aurorablade
53f410272a home streach. 2016-01-26 20:53:13 -05:00
Crazylemon
07a62934e4 Brainmobs can no longer ethereal jaunt 2016-01-25 19:21:40 -08:00
Fox-McCloud
f5220f7ce3 Assault Surplus Create and Knife Refactor 2016-01-22 10:04:24 -05:00
Aurorablade
95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
TheDZD
c7b9c3dc6e Merge pull request #3273 from Fox-McCloud/implant-refactor-II
Implant Refactor Part II
2016-01-19 19:11:10 -05:00
Fox-McCloud
6d98f62c2d leaks 2016-01-19 02:12:34 -05:00
Fox McCloud
f9843fed28 Merge pull request #3195 from KasparoVy/Tail-Fix-A2
Tail Fix Take 2
2016-01-17 23:03:01 -05:00
Fox-McCloud
1bd3da4521 Implant Refactor Part II 2016-01-17 20:03:41 -05:00
KasparoVy
b6af0dd02b TAIL FIX! Squashing all those commits...
- Adds blank icons with standardized timings for species tail wagging,
used in icon generation.
- Fixes tails overlapping arms/limbs + gloves, etc. when facing EAST or
WEST.
- Ensures tails will overlap stuff as normal only when facing NORTH so
as to avoid unwanted interference with the base sprite.
- Tails now appear in ID cards, overlaying things correctly.
- Tails now overlay and are overlaid by things correctly in preview
icons.
- Modifies the positioning of tail icon generation in the ID card
preview icon generation file.
- Modifies the positioning of tail icon generation in the player
preferences preview icon generation file.
- Breaks limb generation into its own layer, breaks tail generation into
a second layer that can be overlaid by limbs.
- TAIL_LAYER will now overlay the NORTH direction sprite of a tail now,
while TAIL_UNDERLIMBS_LAYER gets all remaining directions.

**AIMS TO DO THE FOLLOWING:**
- *ELIMINATE THE ISSUE IN #3183 WITH DUPLICATE TAIL ICON GENERATION*
- *ELIMINATE THE ISSUE IN #3183 WITH TAILS WAGGING TOO FAST/INCORRECTLY*
- *ELIMINATE THE ISSUE IN #3183 WITH BODY ICONS NOT RENDERING*

Missed a spot

Occurred when reformatting the code and reducing the number of pointless
variables

Missed a spot 2

Crash Fix

Fixes Spontaneous Tail Overlapping Limbs

Tiny Unathi Sprite Corrections

One pixel on the Unathi right arm east direction sprite was miscoloured
(used left arm west direction as a reference), and the animated Unathi
tails previously did not meet the body while naked-- appearing to float.

Fixes both

Finalizes Changelog

Cleans up Vox puke

Accommodates Admin Overrides to body_accessory Species Checks & Fix

Does the above
Elaborating on accommodation: Species getting body accessories that
wouldn't normally be getting body accessories will inherit the
Vulpkanin's default animation template as those are currently the only
tails we have to worry about right now
Elaborating on Fix: Adds a default animation template for Vulpkanin in
body_accessory as the animation timings for Vulpkanin tails there are
different from those in effects/species.dmi

Unathi Static Tail Fix

Adjusts north-direction Unathi static tail sprite, now attaches to the
body in the correct location.

This PR is now on Sale!

Significantly cheaper.

Now, it will only generate tail icons on a per-direction basis if the
user's species is flagged to have a tail that is overlapped by limbs
(TAIL_OVERLAPPED).

Otherwise, it just uses the traditional cheapo method of icon
generation.

This way, we have fixed wagging Voxtails at a lower cost.

Even Cheaper

If the user's species isn't flagged to have a tail that needs to be
overlapped by limbs, it won't divert limbs into their own layer as it's
unnecessary. Tested by spawning a member of every species, walking
around to see if there was any directional issues, wagging and *swagging
all tails-- all is still working as it should be.
2016-01-17 19:32:22 -05:00
TheDZD
69f6c178aa Merge pull request #3251 from Fox-McCloud/implant-refactor
TG Implant Refactor/Overhaul
2016-01-17 18:37:50 -05:00
TheDZD
e4120a68b0 Merge pull request #3264 from Fox-McCloud/elite-hardsuit-grammar
Fixes Elite Hardsuit Description
2016-01-17 17:48:39 -05:00
Fox-McCloud
837ca759c9 Fixes Elite Hardsuit Description 2016-01-16 21:46:38 -05:00
Fox-McCloud
ff9acaf730 Merge remote-tracking branch 'upstream/master' into implant-refactor 2016-01-16 20:52:36 -05:00
Fox McCloud
9e55d11fa9 Merge pull request #3178 from Aurorablade/insertlewdcommenthere
try to fix mindslave implant hud
2016-01-16 20:39:57 -05:00
Fox-McCloud
ec350a0b5c TG Implant Refactor/Overhaul 2016-01-16 01:50:10 -05:00
Aurorablade
51013b97c0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-15 08:10:24 -05:00
Aurorablade
28a2980110 HALP HALP 2016-01-14 14:56:56 -05:00
Crazylemon64
de13a4e4d3 Various Ragin' Mages fixes
* Additionally, increases the number of memes in the codebase
2016-01-13 21:56:56 -08:00
Aurorablade
602d4c1c2f what am i even doing... 2016-01-12 16:22:42 -05:00
TheDZD
3c8ec5fd1a Merge pull request #3181 from Fox-McCloud/remove-organs
Removes Organs
2016-01-10 23:27:12 -05:00
Fox McCloud
274b9df69f Revert "Fixes Tails Overlaying Arms" 2016-01-10 08:04:07 -05:00
Fox-McCloud
369e95890c Removes Organs 2016-01-10 04:47:29 -05:00
Fox-McCloud
df75c3418d tweak 2016-01-09 21:19:20 -05:00
Fox-McCloud
a2e825603e Adds in Tradable Telecrystals 2016-01-09 17:42:03 -05:00
KasparoVy
0c0f505d82 Fix Pass 1
Issue: Facing north means the tail is overlayed by just about everything
but the body.
2016-01-08 16:33:57 -05:00
Fox-McCloud
ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
TheDZD
3d316d9c66 Merge pull request #3116 from Fox-McCloud/slipping-floors
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Fox-McCloud
38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00
Fox McCloud
103372e92b Merge pull request #3037 from KasparoVy/master
Adds Body Marking Customization, Head Accessories, Revises Unathi Customization, Related Minor Fixes, etc.
2016-01-03 22:33:40 -05:00
Fox-McCloud
7830cd215b shotgun 2016-01-03 04:03:48 -05:00
Fox-McCloud
eade350dc8 Sec Rifle Port 2016-01-02 01:06:37 -05:00
Aurorablade
bd19dc6942 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-01 22:38:23 -05:00
Fox-McCloud
e38417cebe Electrocution Refactor+Electric Reagents 2015-12-31 17:28:27 -05:00
KasparoVy
eb47c80d75 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 18:16:17 -05:00