3d316d9c66
Merge pull request #3116 from Fox-McCloud/slipping-floors
...
Slippery Refactor and Floors
2016-01-05 21:42:26 -05:00
4221d033ab
Slipping Refactor and Floors
2016-01-04 21:22:59 -05:00
38149bfc7d
Merge remote-tracking branch 'upstream/master' into sec-rifle
2016-01-03 22:35:28 -05:00
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
7830cd215b
shotgun
2016-01-03 04:03:48 -05:00
eade350dc8
Sec Rifle Port
2016-01-02 01:06:37 -05:00
e38417cebe
Electrocution Refactor+Electric Reagents
2015-12-31 17:28:27 -05:00
eb47c80d75
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 18:16:17 -05:00
135475332b
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2015-12-30 17:41:26 -05:00
e67450d56d
Merge pull request #3025 from Crazylemon64/infinite_antags
...
Infinite antag tags
2015-12-30 13:52:41 -05:00
6433e3fc41
Merge pull request #3043 from Fox-McCloud/elite-syndi-hardsuit
...
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-30 13:49:39 -05:00
0f03947d55
Ports Elite Syndicate Hardsuit and Uplink Refactor
2015-12-28 08:37:27 -05:00
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
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
9bc614ab8e
Gas Mixture Refactor and Speedup
2015-12-27 18:58:16 -05:00
6ba20458e5
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
...
# Conflicts:
# icons/mob/human_face.dmi
2015-12-27 18:42:59 -05:00
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
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
be3bb885f2
Melting Snowflakes & (Adds/Changes Frills & Adds Body Markings)
2015-12-26 00:48:01 -05:00
13f2f92624
Merge pull request #2999 from Fox-McCloud/tesla-port-final
...
Ports TG's Tesla Engine
2015-12-25 16:21:11 +01:00
5069d949bd
Ports TG's Tesla Engine
2015-12-24 00:40:20 -05:00
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
bbf3b528c4
Field Generator Refactor+Fixes
2015-12-22 13:40:53 -05:00
0f8f514671
Adds Unathi Horn and Tail Customization
...
Does not include tail colour correction.
In this iteration, the horns do not have their own colour-- they use the
skin colour.
2015-12-21 22:55:39 -05:00
6bde6078e2
don't code half awake
...
also added some hud making stuff to the make antag procs. it might fix
an issue fox reported..more sleep now
2015-12-20 07:16:35 -05:00
3ae8118b9c
please let me have map merged right....
2015-12-18 03:09:25 -05:00
ccd6d2641b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor
2015-12-17 22:43:09 -05:00
52e43c4d2d
good news everyone! It works!
2015-12-17 01:29:21 -05:00
a9a0a49986
Ports TG Beam Code and Medigun
2015-12-16 21:05:10 -05:00
c3f662a6dc
zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
2015-12-15 03:08:16 -05:00
95d8b50345
hud_updateflag purge!
...
EXTERMINATUS BITCH
2015-12-13 17:16:14 -05:00
3d71483372
/vg/ / -tg- asset_cache
...
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION
Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!
Also moves a few nano files around.
2015-12-12 21:25:04 -08:00
aca9d31853
almossstttttt
2015-12-12 18:45:07 -05:00
374867baf7
Now channeling beepsky
2015-12-11 14:57:41 -05:00
950ae86a92
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor
2015-12-10 06:47:43 -05:00
972177d1e9
its working..kinda
2015-12-10 06:45:19 -05:00
c590958f2d
Hud refactor
2015-12-10 01:01:54 -05:00
cf42d3b037
Re-Adds Weapon Based Nettles
2015-12-08 07:24:43 -05:00
3fad5ca991
Merge pull request #2742 from ZomgPonies/blood
...
exotic blood changes
2015-12-07 01:03:06 -05:00
cc16f034ee
Fixes Records
2015-12-05 19:01:51 -05:00
fab7f1f6b0
exotic blood changes
2015-12-05 16:46:07 -05:00
2c5a210ad8
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Guardingthings
2015-11-24 21:08:43 -05:00
85d651b781
refactored datum/effect/system because it was a complete mess
2015-11-22 19:43:01 -05:00
740e5304fd
Merge pull request #2613 from ZomgPonies/nations2
...
Nations 2.1
2015-11-21 22:20:39 -05:00
bbab399d6e
Merge pull request #2599 from Fox-McCloud/thanksgiving-food
...
Thanksgiving Update
2015-11-20 19:46:47 -05:00
f259263fdd
Changed AI law to a single comprehensive ruleset
2015-11-20 10:35:09 -05:00
5986006578
guarding yo things
2015-11-20 08:11:22 -05:00
ced5567176
its
2015-11-19 18:46:30 -05:00
84e9978cf4
Law tweaks
2015-11-19 15:38:14 -05:00
6c907de639
Cleaning up following DZD's recommendations
2015-11-19 15:24:06 -05:00
TheDZD