cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,038 Commits 26 Branches 2 Tags
b77d200603528cf6655e48e2fa7b4e00bb202037
Commit Graph

6903 Commits

Author SHA1 Message Date
Ar3nn
f702a9feae One more refactor 2016-08-17 21:10:49 -04:00
Ar3nn
45e5e7b837 Come at it from a better angle 2016-08-17 00:30:25 -04:00
Ar3nn
11fea60587 Properly spawns robot debris 2016-08-16 20:56:11 -04:00
Isaac Erwin
11e86c434e Fixes talking swords being unable to their wielders, or anyone 2016-08-14 13:48:54 -04:00
FreeStylaLT
b9e57a987a caw caw 2016-08-13 14:19:37 +03:00
Fox McCloud
5173fda6b8 Merge pull request #5345 from FlattestGuitar/vomit 
People don't vomit near corpses.
 2016-08-12 20:11:25 -04:00
Mieszko Jędrzejczak
1c3cc1b5a3 Detectives don't vomit. 2016-08-13 01:42:19 +02:00
TheDZD
e944f176d6 Merge pull request #5418 from Fox-McCloud/malf-ai-rework 
Malf AI Rework
 2016-08-12 18:30:41 -04:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
41a74fb865 Malf AI Rework 2016-08-11 05:16:06 -04:00
TheDZD
fea52d62b7 Merge pull request #5390 from Fox-McCloud/no-lag 
Makes Resting Less Laggy
 2016-08-10 18:09:31 -04:00
Tigercat2000
58103757cc Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/newobjective.dm
	code/game/gamemodes/objective.dm
 2016-08-10 14:16:42 -07:00
Crazylemon64
1b93ce9b8b Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation 2016-08-10 11:02:05 -07:00
Fox McCloud
a8ecd38ed9 Merge pull request #5387 from Alexshreds/paifix 
When the Copy Pasta Monster Fails...
 2016-08-09 16:43:34 -04:00
Fox-McCloud
94340f2548 Makes Resting Less Laggy 2016-08-09 05:06:21 -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
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07: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
Crazylemon64
7db4094a38 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation 2016-08-03 13:31:42 -07:00
Krausus
dba8af8ab5 Removes dels and unused code that contains dels 2016-08-02 01:33:19 -04:00
Tigercat2000
9f3cdb43f7 special_role/objective refactor 
Refactored most instances of special_role setting/checking to use new
SPECIAL_ROLE_X defines in code/__DEFINES/gamemode.dm

Removed relative pathing from objective.dm and split large if statements
into multiple, plus a bunch of styling fixes

Refactored every instance of `istype(ticker.mode` into a GAMEMODE_IS_X
define in code/__DEFINES/gamemode.dm. Done primarily for when someone gets
around to making gamemode code less AWFUL
 2016-08-01 21:29:19 -07:00
Crazylemon64
bc93078da5 Merge conflicts begone 2016-08-01 18:28:47 -07: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
Crazylemon64
bf2bcbce67 Removes most hard-coded z level checks 2016-07-31 21:29:03 -07: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