cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-16 04:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,655 Commits 27 Branches 2 Tags
bb30a02dd575b43d195d4ea957296b048dee97db
Commit Graph

6837 Commits

Author SHA1 Message Date
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
Crazylemon64
ae43de3652 Integrates the z level manager with the space transition system 2016-07-29 19:11:36 -07: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
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
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
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
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
TheDZD
c7f016a702 Makes CC admin-only jobs check for R_EVENT instead of R_ADMIN, fixes some message spam for mentors that don't have enough access, fixes me fucking up and not checking for rights correctly in the telecomms reset verb. 2016-07-25 19:40:55 -04:00
Fox McCloud
e0f2d4eef5 Merge pull request #5100 from TheDZD/salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt 
Re-adds PDA Slot
 2016-07-24 23:22:15 -04:00
Fox-McCloud
d20df994a6 Trauma and Burn Kit Rework 2016-07-23 09:36:51 -04:00
Fox-McCloud
25c01ef3ba Fixes up apply_damage 2016-07-22 21:03:17 -04:00
Crazylemon64
ca20966b96 No longer drop bodyparts still in use 2016-07-22 16:54:08 -07:00
TheDZD
f73f1b4a17 Merge pull request #5144 from Fox-McCloud/medical-stacks 
Refactors Medical Stacks
 2016-07-22 14:45:12 -04:00
Fox McCloud
f81a6c2157 Merge pull request #5137 from Kyep/ssd_alert 
Makes looting/attacking SSD players more obvious
 2016-07-22 10:01:10 -04:00
TheDZD
7fa74a1d1e Re-adds PDA slot 2016-07-21 13:04:02 -04:00
Fox-McCloud
a4e7a41426 Refactors Medical Stacks 2016-07-21 12:26:21 -04:00
TheDZD
6d095d50f5 Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued 
More Reagent Refactoring and Cleanup
 2016-07-21 10:12:14 -04:00
TheDZD
977aa93e44 Merge pull request #5089 from Fox-McCloud/clothing-restrictions 
Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change
 2016-07-21 10:09:36 -04:00
TheDZD
eb2aec4db7 Merge pull request #5090 from Fox-McCloud/mob-death-refactor 
Refactors Simple Animal Death and Implements Spawners
 2016-07-21 10:08:25 -04:00
TheDZD
544e8e2e30 Merge pull request #5107 from Fox-McCloud/buttonssss 
Fixes Performance Issue with Action buttons, removes redundant verbs
 2016-07-21 09:23:54 -04:00
Fox McCloud
dc741e837e Merge pull request #5113 from Allfd/Vulptail6 
Adds a 6th Vulpkanin tail option v2
 2016-07-21 09:18:02 -04:00
Kyep
e08a7a2878 Krausus proc/isSSD change 2016-07-21 03:55:25 -07:00
Fox-McCloud
5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Kyep
74931bdd8d Spaces 2016-07-21 02:30:08 -07:00
Kyep
e70b7143b1 Deletes 3 2016-07-21 01:59:22 -07:00
Kyep
e188bef585 Fox Fox, Fox: Fix, Fix Fix 2016-07-21 01:51:31 -07:00
Kyep
4f559e2b8e Makes looting/attacking SSD players more obvious 2016-07-21 01:45:16 -07:00
Fox-McCloud
d37ba22851 oops, forgot this 2016-07-21 04:33:41 -04:00
Fox-McCloud
0a8dca713c proper ear damage proc 2016-07-21 04:24:12 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud
1ac09a962c Cleans up Vars 2016-07-21 01:43:16 -04:00