Commit Graph

5875 Commits

Author SHA1 Message Date
TheDZD
3d316d9c66 Merge pull request #3116 from Fox-McCloud/slipping-floors
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
TheDZD
34901c8664 Merge pull request #3125 from Fox-McCloud/typo-fixes
Fixes a Few Vulp Typo's
2016-01-05 20:20:37 -05:00
Fox-McCloud
9478fc078c Fixes a Few Vulp Typo's 2016-01-05 19:39:19 -05:00
TheDZD
750d555ff0 Merge pull request #3107 from Fox-McCloud/vox-tails-vulp-markings
Vox Tail and Vulp Markings
2016-01-05 19:35:34 -05:00
Fox-McCloud
38ee27898b structuring 2016-01-05 01:34:16 -05:00
Crazylemon64
3a3f0f56c4 Simple_animals now tick down sleeping, so relogging doesn't cause deaf 2016-01-04 21:48:03 -08:00
Crazylemon64
2f642e6d75 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into simple_animals_sleeping 2016-01-04 21:44:27 -08:00
Fox-McCloud
447be6f9fd binsult.ogg 2016-01-05 00:41:46 -05:00
Fox-McCloud
4221d033ab Slipping Refactor and Floors 2016-01-04 21:22:59 -05:00
Crazylemon
df224e81d6 Simple animals will now tick down sleeping 2016-01-04 13:47:36 -08:00
Crazylemon
855b2f7f61 Summoned guardians will vanish without a master 2016-01-04 07:01:36 -08:00
Fox-McCloud
59a3a5281e Vox Tail and Vulp Markings 2016-01-04 02:10:47 -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
5f43d9e93f Merge pull request #3088 from tigercat2000/code_styling_nazi
January Cleaning
2016-01-03 19:42:09 -05:00
Tastyfish
9ebe5c2c5c Fixed using :i to speak into intercoms 2016-01-03 18:29:19 -05:00
TheDZD
b161d32687 Merge pull request #3081 from Fox-McCloud/on-fire
Updates On Fire Sprite
2016-01-03 11:23:44 -05:00
Tigercat2000
b606a6d1fd Clean incorrect styling for the ++ operator 2016-01-02 10:46:01 -08:00
KasparoVy
f18c04ed0e Adds Vulpkanin head markings to Head Accessory
Tested and it turns out it looks pretty good. The purpose of this commit
is that most of the facial markings work quite well together in pairs
given proper colouring and can look pretty sweet, so why not
2016-01-02 01:13:14 -05:00
Fox-McCloud
78abd5b12e Updates On Fire Sprite 2016-01-01 21:06:07 -05:00
TheDZD
ac8a3ba061 Merge pull request #3068 from Fox-McCloud/shocking
Electrocution Refactor+Electric Reagents
2016-01-01 18:55:36 -05:00
Fox McCloud
e27d585889 Merge pull request #3072 from Aurorablade/Flyswatter
bug fixes
2016-01-01 17:33:19 -05:00
Tastyfish
421faee4f8 Makes footstep sounds check if we actually moved 2016-01-01 01:45:47 -05:00
Aurorablade
ce7f05334d Bug fixes 2016-01-01 01:26:44 -05:00
Fox-McCloud
29ed8f2399 tweak 2015-12-31 18:17:12 -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
KasparoVy
135475332b Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 17:41:26 -05:00
Fox McCloud
e67450d56d Merge pull request #3025 from Crazylemon64/infinite_antags
Infinite antag tags
2015-12-30 13:52:41 -05:00
Fox McCloud
9b2db8dd24 Merge pull request #3044 from DaveTheHeadcrab/ninja
Add darkness_view to Helmets
2015-12-29 23:42:09 -05:00
KasparoVy
8641c065a3 Removes Old Earfluff Entries, Finishes SQL Support, Accommodates #3025 2015-12-28 19:17:56 -05:00
SamCroswell
24aa63c812 Adds darkness_view to helmets 2015-12-28 09:55:13 -05:00
KasparoVy
366d05f745 Generalization + Features for Other Species
Turns horns into head accessories, fixes some species checks, gets
Tajara and Vulpkanin into the mix, ensures the system cannot be
exploited, adds species-specific body markings for Tajara, Vulpkanin and
Unathi.
2015-12-28 01:02:23 -05:00
KasparoVy
738d951707 Fixes Oversight - Preference Preview Icon Using Correct Colour
I'd missed this bit before where for the preview icon (only) it was
still using the skin colour to generate the horns. Fixed it up so the
preview icon is accurate.
2015-12-27 19:48:24 -05:00
KasparoVy
abb528366e Guts Tails (for now), adds Horn Colour Customization, Fixes Icon Typo, Cuts Old File, Adds Species Checks
Cuts tail markings to be implemented in another PR, adds the ability to
change the horn colour independent of the body colour and reworks the
code accordingly, drops the preferences_savefile.dm as it's unused
(@crazylemon64), adds some species checks just for uniformity
2015-12-27 19:43:12 -05:00
Tigercat2000
9cb84e83ca Clean old shit, delete old files, move files, mrowl 2015-12-27 15:58:41 -08:00
KasparoVy
8bbd18846d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-27 18:44:45 -05:00
KasparoVy
6ba20458e5 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
# Conflicts:
#	icons/mob/human_face.dmi
2015-12-27 18:42:59 -05:00
Crazylemon
c227ae536c Added a bunch of new antag tags because whee these are cheap
Also it compiles now
as for not turning the DB into mush... wait on that "feature"
2015-12-27 07:58:21 -08:00
KasparoVy
5f72fff880 Final Pass
Breaks Facial Hair updates into their own proc and puts facial hair on
its own layer.
Works through everything that calls update_hair with the intention of
updating facial hair and adds update_fhair
Fixes the sprite names and colouring on all 'facial' and 'body marking'
aspects.

Fixes/implements proper ID photo/preferences preview picture generation.

To do: Tail marking customization possible rework, gutting in the
meantime
2015-12-27 05:45:25 -05:00
FalseIncarnate
81ce03572b Evil Santa Fixes/Tweaks
Adds all Santa mobs to the global blocked_mobs list
- Will prevent gold cores and rifts from spawning stage 2 santas

Gives Final Form Santa (Stage 4) a small buff to health and minimum
damage
- All other stages left unchanged, Stage 4 was just a bit lackluster for
a "final form"

Fixes melee snowmen not ever dropping the brand new CANDY SWORD. They
now will have a 50% chance.
- It's a sharpened candy cane. Festive and painful.
- Ranged snowmen do not drop the candy sword, as they don't carry a
weapon.
2015-12-26 23:54:24 -05:00
Crazylemon
4133e98dfe Port of RemieRichard's infinite antag system
This is just the first chunk, of fixing around the be_special flag stuff
It will probably break everything as-is
2015-12-25 22:51:02 -08:00
KasparoVy
73d514f5a2 Ensures PR Won't Overwrite #2910
I was a bit sketched out 'cause #2910 changed some files that this PR
deals with, so I made changes to accommodate that which was done in
#2910.
tl;dr this pr won't mess with the work done in #2910 now
2015-12-26 01:01:07 -05:00
KasparoVy
be3bb885f2 Melting Snowflakes & (Adds/Changes Frills & Adds Body Markings) 2015-12-26 00:48:01 -05:00
Mark van Alphen
13f2f92624 Merge pull request #2999 from Fox-McCloud/tesla-port-final
Ports TG's Tesla Engine
2015-12-25 16:21:11 +01:00
Fox McCloud
9d8c5ba4fc Merge pull request #3003 from FalseIncarnate/master
Naughty List Revenge
2015-12-24 23:03:35 -05:00
FalseIncarnate
5132e67d64 Cleanup
Cleaned up the code a bit
- Fewer death proc defines
- Cleaner away mission list
- Slightly increased the time between Santa's "death" and next form (0.5
-> 1.0 seconds)
- Made the victory announcement slightly more visible among other
messages
2015-12-24 18:01:05 -05:00
Fox-McCloud
7ef528dcdc Medibeam and Guardian Fixes 2015-12-24 11:28:40 -05:00
FalseIncarnate
c032781c7b Naughty List Revenge
Santa has refused to deliver presents to the NSS Cyberiad for an unknown
reason.

Meanwhile, a distress beacon is received from the North Pole, on an
unencrypted Syndicate frequency. Apparently, Christmas Eve was anything
but a silent night.

A rogue operative seems to have infiltrated the North Pole and attempted
to coerce Santa into removing him from the Naughty List, but his plans
may have backfired. Santa has finally snapped, and must be put down in
order for the crew to receive their gifts this year.

The gateway has been reconfigured to lock onto the general location of
the distress signal, and will not lock on to any other destinations
until after Christmas has passed. Be warned, however, that the frozen
north is far from hospitable, and a variety of dangers await you beyond
the safety of the blast doors.

This mission will offer some new challenges, and is designed to be
undertaken by a squad of players. Will your team be able to put Father
Christmas to rest and rescue the presents, or will you meet your demise
in the freezing tundra?
2015-12-24 03:40:31 -05:00
Fox-McCloud
5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
Fox McCloud
f6612ee40f Merge pull request #2975 from Aurorablade/voxtest2
Voxtest2.ogg
2015-12-22 22:54:42 -05:00