Commit Graph

13438 Commits

Author SHA1 Message Date
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
SamCroswell b690dd8a9d Replaces Sleep with Paralysis 2015-12-28 00:21:38 -05:00
KasparoVy c6e265e410 SQL Support for Horns and Markings 2015-12-27 20:42:10 -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
Crazylemon64 6f631b94c3 Reduces the amount of memes in the codebase 2015-12-27 14:46:11 -08:00
Crazylemon64 45e49de3f8 Adds an update proc for the sql DB, run as the DB is loaded
There's probably a cooler and more automated, at-once solution to this
though
2015-12-27 14:33:14 -08:00
Crazylemon64 dc29161339 Adds an SQL list sanitization proc, and stores our tags in the DB 2015-12-27 13:43:50 -08:00
SamCroswell 2a62ed1dce Tigercat's Optimizations 2015-12-27 15:59:42 -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
Crazylemon 23e8b1277f Wave 2 of tweaks, probably needs a little more
Ripped out the preferences_savefile.dm because it's obsolete and we
don't use it
2015-12-27 06:32:25 -08:00
SamCroswell 8e10d08573 Adds "Creeping Widow" martial art 2015-12-27 05:57:16 -05: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
Aurorablade b58ed5a9d4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-26 22:18:09 -05:00
Aurorablade 2146cc0d3d things
and stuff...gonna need to get to those merge conflicts eventually. also
purged all mention of internal_organs by name from the face of the
earth. we have get_int_organ now...i may need to tweak shit. oh and i
broke some things...
2015-12-26 17:34:38 -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
Fox McCloud 9fd2885924 Merge pull request #3013 from tigercat2000/nano_why_u_do_this
NanoUI Upgrades (Part 1) [Gone Wrong][Gone Sexual][Gone Insane]
2015-12-26 01:41:26 -05: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
Aurorablade 4e1f63da7e wot 2015-12-25 01:05:47 -05:00
Fox McCloud 9d8c5ba4fc Merge pull request #3003 from FalseIncarnate/master
Naughty List Revenge
2015-12-24 23:03:35 -05:00
Aurorablade 027d9660de IT COMPILES 2015-12-24 20:26:46 -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
Tigercat2000 423ef23e18 Beginnings of NanoGulp 2015-12-24 11:26:37 -08:00
Fox-McCloud 7ef528dcdc Medibeam and Guardian Fixes 2015-12-24 11:28:40 -05:00
Fox-McCloud bfb23936f9 Tesla Update and Orbit Update 2015-12-24 10:29:10 -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 7677864951 derp 2015-12-24 02:31:53 -05:00
Fox-McCloud a1e4446f9c better logging 2015-12-24 01:42:48 -05:00
Fox-McCloud 5069d949bd Ports TG's Tesla Engine 2015-12-24 00:40:20 -05:00
Aurorablade 1a70e9caf5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2015-12-24 00:17:26 -05:00
Aurorablade 5d7aa0ae00 missed one 2015-12-24 00:14:04 -05:00
Aurorablade 96c5a5c010 might as well fix fonglict 2015-12-23 22:18:11 -05:00
TheDZD 7449cde946 Merge pull request #2996 from Fox-McCloud/pooling-upate
Pooling Update from TG
2015-12-23 21:50:07 -05:00
TheDZD 65bb820991 Merge pull request #2992 from Fox-McCloud/emp-fix
EMP Fixes
2015-12-23 21:49:57 -05:00
TheDZD e33c83879d Merge pull request #2980 from Fox-McCloud/research-lockboxes
Research Lockbox Access Change and Wormhole Projector Lockboxing
2015-12-23 17:08:32 -05:00
Tigercat2000 6dccb387e7 Fix nukeops pipes n' nukes disapperin 2015-12-23 13:38:59 -08:00
Fox-McCloud 0adbb2788e Pooling Update from TG 2015-12-23 16:34:34 -05:00
Aurorablade 046b0b997d almost.... 2015-12-23 11:40:16 -05:00
Fox-McCloud 09dab6bdea EMP Fixes 2015-12-23 04:09:47 -05:00
Fox-McCloud 41c5a146e0 multiple access 2015-12-23 01:54:53 -05:00
Fox McCloud f6612ee40f Merge pull request #2975 from Aurorablade/voxtest2
Voxtest2.ogg
2015-12-22 22:54:42 -05:00
TheDZD bd8631ca48 Merge pull request #2981 from Fox-McCloud/field-generator-refactor
Field Generator Refactor+Fixes
2015-12-22 22:20:10 -05:00
TheDZD 335c9bc399 Merge pull request #2917 from Fox-McCloud/remove-tribesmen
Nukes Jungle Module
2015-12-22 22:19:38 -05:00
Fox McCloud 9e30d18941 Merge pull request #2922 from Crazylemon64/rdboard-reconfig
RnD Console Permissions are more Persistent
2015-12-22 22:01:36 -05:00