Commit Graph

19529 Commits

Author SHA1 Message Date
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
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
TheDZD
8ad4d33b7f Merge pull request #3034 from FalseIncarnate/master
Evil Santa Fixes/Tweaks
2015-12-27 18:16:37 -05:00
TheDZD
ec9d4aa8b0 Merge pull request #3019 from monster860/longerntsl
Changed TComms Traffic Control to use POST for NTSL code
2015-12-27 17:55:28 -05:00
Fox McCloud
4933717afd Merge pull request #3014 from Robertha89/patch-3
Fixes Battle Arcade Rupturing Eardrums
2015-12-27 17:35:22 -05:00
Robertha89
258d8278b5 Fixes mistake 2015-12-27 22:39:57 +01:00
Robertha89
d86d233b58 Actually reduces the volume by a fair bit 2015-12-27 21:58:11 +01: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
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
monster860
06e06b614f Changed Traffic Control to use POST for NTSL code 2015-12-25 12:08:35 -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
Fox-McCloud
3a8a09b583 multiplication is faster 2015-12-24 21:18:20 -05:00
TheDZD
958af132ec Merge pull request #3008 from Fox-McCloud/fixes-of-sorts
Medibeam and Guardian Fixes
2015-12-24 19:56:49 -05:00
Fox McCloud
d420e12193 Merge pull request #2995 from tigercat2000/patch-1
Restore drone law order
2015-12-24 19:55:16 -05:00
Robertha89
f721e13ebc Prevents people from murdering people playing the Battle arcade
Reduces sound range for 12 to 3
2015-12-25 01:50:34 +01: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
8ad00d59f8 Nukeynukes~ 2015-12-24 12:31:40 -08: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
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
Fox McCloud
fcf95d0db7 Merge pull request #2918 from monster860/compilentslfast
Adds the ability to compile NTSL to all telecomms servers at the same time
2015-12-23 17:15:18 -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
TheDZD
dadf0f0d90 Merge pull request #2989 from Fox-McCloud/thanksgiving-to-christmas
Removes Thanksgiving/Fall Decorations--Adds Christmas Tree
2015-12-23 17:07:18 -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
Fox-McCloud
8d2ecd8b05 doors 2015-12-23 16:02:40 -05:00
tigercat2000
c5e37ee695 Restore drone law order
#1913 changed the drone laws, staffchat is having a fit over it, so whatever
2015-12-23 12:09:40 -08:00
Fox McCloud
d11da97e74 Merge pull request #2991 from Tastyfish/drilling-the-station-with-my-pipe
fixes drilling bent pipes into walls
2015-12-23 05:38:25 -05:00
Fox-McCloud
09dab6bdea EMP Fixes 2015-12-23 04:09:47 -05:00
Tastyfish
7aa9ac2000 fixes drilling bent pipes into walls 2015-12-23 03:03:13 -05:00
Fox-McCloud
b8adbee8bb Removes Thanksgiving/Fall Decorations--Adds Christmas Tree 2015-12-23 02:23:04 -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
Fox McCloud
56d05c992e Merge pull request #2921 from Markolie/cargoui2
Re-implement NanoUI cargo console
2015-12-22 22:00:01 -05:00
Fox-McCloud
bbf3b528c4 Field Generator Refactor+Fixes 2015-12-22 13:40:53 -05:00
Fox-McCloud
2481a8d7bd Research Lockbox Access Change and Wormhole Projector Lockboxing 2015-12-22 11:42:09 -05:00