Commit Graph

6883 Commits

Author SHA1 Message Date
Fox McCloud
a8ecd38ed9 Merge pull request #5387 from Alexshreds/paifix
When the Copy Pasta Monster Fails...
2016-08-09 16:43:34 -04:00
Krausus
2bec576fdc Adds qdels for some temporary humans 2016-08-09 02:58:36 -04:00
Chakirski
5123e47c21 Holy fuck batman look at all those tabs! 2016-08-09 01:19:37 -05:00
Fox McCloud
607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Fox McCloud
86d0c0b2b9 Merge pull request #5147 from KasparoVy/tail-markings
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-08-08 21:58:45 -04:00
TheDZD
f7b6928a9f Merge pull request #5355 from Fox-McCloud/malf-ai-update
Malf AI Powers Update
2016-08-08 21:30:12 -04:00
Fox-McCloud
aa1e0407d4 Illusion Simple Animals Have Attack Sounds 2016-08-08 00:20:13 -04:00
Fox McCloud
63fa330885 Merge pull request #5314 from Chakirski/AIholopets
Adds AI Holopets
2016-08-07 23:06:59 -04:00
LittleBigKid2000
0eed28cdba Corgi Gender Equality (#5330)
* Corgi Gender Equality

* I'd prefer to die on my own terms, thanks
2016-08-07 23:06:07 -04:00
Fox-McCloud
35557881ab Malf AI Powers Update 2016-08-07 04:48:21 -04:00
Krausus
e9886d05fc Human overlay caching and minor overlay fixes 2016-08-04 11:14:56 -04:00
TheDZD
44ae3a4a68 Merge pull request #5309 from Fox-McCloud/field-generators
Field Generator Cleanup, Singularity Fixes,
2016-08-03 23:29:09 -04:00
Chakirski
d54e842692 I can already tell only some of these will ever be used. 2016-08-03 19:49:44 -05:00
Fox McCloud
a15721b22a Merge pull request #5209 from Krausus/OnceYouLeaveYouCannotComeBack
Changes to Player Respawnability
2016-08-03 19:12:04 -04:00
Krausus
65627091b3 Optimizes and adds missing limbs to health dolls 2016-08-03 18:38:37 -04:00
Fox-McCloud
5533c36af3 Field Generator Cleanup, Singularity Fixes, 2016-08-03 17:17:04 -04:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
TheDZD
bc98945c7a Merge pull request #5177 from Fox-McCloud/medical-stack-rework
Trauma and Burn Kit Rework
2016-08-01 21:03:07 -04:00
TheDZD
8e9850d76a Merge pull request #5222 from Crazylemon64/json_serialization2
Lets you convert people to text and back again
2016-08-01 20:55:08 -04:00
TheDZD
0cc2051f8a Merge pull request #5251 from Fox-McCloud/fire-system
Implements Fire System
2016-08-01 19:39:50 -04:00
Fox McCloud
6bdd3d53a5 Merge pull request #5229 from Allfd/Alffd-Fluff
Alffd fluff sprites
2016-07-31 22:42:49 -04:00
TheDZD
6fb43d3d1e pAIs are no longer illusionists 2016-07-31 21:59:47 -04:00
Fox McCloud
5b6a13130a Merge pull request #5223 from Aurorablade/Voxpireyaya
Alternative to #5219 :super snowflake edition
2016-07-31 21:42:15 -04:00
Crazylemon64
291fac97a0 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into json_serialization2 2016-07-31 12:41:32 -07:00
Fox McCloud
4c40a74746 Merge pull request #5254 from Crazylemon64/space_allocation
Updates space transitions and integrates it with the space management module
2016-07-31 12:18:19 -04:00
allfd
9fe03184c0 Added additional sanity check 2016-07-30 19:21:15 -04:00
Fox McCloud
3ae033ee41 Merge pull request #5257 from Krausus/NullObjectiveFix
Fixes Round-End Objective List Runtimes
2016-07-30 18:46:57 -04:00
Krausus
a55f9d1f35 Fixes nulling of objectives lists 2016-07-30 11:55:22 -04:00
Krausus
545660f474 Fixes late-join window's round duration 2016-07-30 02:27:58 -04:00
KasparoVy
0dff7ce1ea Darkens Vulpkanin head hair and Tajaran head+face hair
Forgot to do this when I darkened the bodies.
Tajaran head/facial hair darkened by 28. (r - 28, g - 28, b - 28)
Refer to PR for Vulpkanin darkening factors. (Varies per-hairstyle)
2016-07-29 23:46:04 -04:00
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07:00
Krausus
03abd702e5 Adds early abandon penalty period and other tweaks
- New config option to set how many minutes is too early in a round to
abandon it
- Suicide-ghosting and cryo-ghosting now only make you non-respawnable
during the penalty period
- Manually entering a cryopod now despawns you 90% faster
- Joining as a drone now has a confirmation box
2016-07-29 18:26:54 -04:00
Aurorablade
8df912f1d7 removes mask check 2016-07-29 17:15:16 -04:00
Fox-McCloud
731600a21f tweaks 2016-07-29 17:07:25 -04:00
Krausus
f5b5dc3e91 Merge remote-tracking branch 'refs/remotes/origin/master' into OnceYouLeaveYouCannotComeBack 2016-07-29 14:51:05 -04:00
Fox-McCloud
bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Allfd
a2471f2718 Git ate a line for some reason 2016-07-28 21:59:02 -04:00
Allfd
e010f1bd01 Now supports 64 height sprites 2016-07-28 21:52:53 -04:00
KasparoVy
39d3d64207 Staying up to date. 2016-07-28 17:02:07 -04:00
Aurorablade
5e1474dbde tweaks 2016-07-28 07:13:33 -04:00
Crazylemon64
7719b58cf0 Improves serialization: Now with clothes (tm) 2016-07-27 22:26:40 -07:00
Aurorablade
0e858e3be5 i suck yous blood yaya? 2016-07-28 00:20:04 -04:00
Crazylemon64
cc784f338e Adds bare bones for a persistence system
Admins can toy around with converting a character to text, and
placing them back elsewhere, independent of the round.

It's got a kink, though: The text given to you directly needs to be
printed once to remove all the escapes - otherwise the thing will choke.
I'd like advice on resolving that
2016-07-27 13:31:19 -07:00
Krausus
08c1dab72f Makes posibrain pings check observers properly 2016-07-27 02:34:43 -04:00
Krausus
dc9591e502 More respawnability changes
- Respawning as a drone now ignores respawnability again
- Respawning as ERT now ignores respawnability again, but respawnable
ghosts get first dibs
- Becoming a non-respawnable ghost once means all future ghosting will
be be non-respawnable, unless you are sent back to the lobby
- Posibrains now disqualify non-respawnable ghosts, and are more fickle
about pinging
2016-07-27 02:27:50 -04:00
Fox McCloud
8f54ecbace Merge pull request #5170 from Crazylemon64/dropall_fix
No longer drop bodyparts still in use
2016-07-26 13:30:30 -04:00
TheDZD
bcfa4d1863 Merge pull request #5171 from Fox-McCloud/apply-damage
Fixes up apply_damage
2016-07-26 13:28:43 -04:00
Krausus
2b34897f49 Changes to player respawnability
- Cryo auto-ghosting and ghosting after suicide will now produce
non-respawnable ghosts
- Non-respawnable ghosts are now prevented from re-entering the round by
as many means as I could find
2016-07-26 10:29:03 -04:00
Fox McCloud
863ee10391 Merge pull request #5200 from TheDZD/admin-check-fixes
Assorted Admin Rights Check Fixes
2016-07-26 03:38:25 -04:00
KasparoVy
861d873fac Vox versions of the new tattoos. 2016-07-26 02:37:29 -04:00