cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,958 Commits 26 Branches 2 Tags
e9f3ee5cf53a171ced9ea52ff7231e35d0a855a4
Commit Graph

17045 Commits

Author SHA1 Message Date
Terilia
28806f8fd5 Merge remote-tracking branch 'upstream/master' into terifluff 2018-03-13 05:20:20 +00:00
Terilia
ae88de8669 Trying to solve the merge conflicts. 2018-03-13 04:50:25 +00:00
Fox McCloud
96fc4aba1c Merge pull request #8671 from Aurorablade/PodFluff 
Fluff Item: Decemviri
 2018-03-12 15:58:39 -04:00
tigercat2000
fce0f75eb1 Merge pull request #8741 from shazbot194/Desolate_Fluff 
Desolate's fluff name fix, no longer dancing fluff item
 2018-03-07 22:47:49 -08:00
shazbot194
413118d1b4 Removes the dance machine 2018-03-07 15:30:40 -09:00
Tad Hardesty
1ca410b91e Fix various syntactic problems 2018-03-06 23:19:39 -08:00
shazbot194
79539cc0ea Name and Description change 
I forgot to ask Desolate what he wants, here is the fix for that
 2018-03-06 22:18:17 -09:00
shazbot194
cc5d9bc31e Adds in Desolate's dance machine button 2018-03-06 22:10:12 -09:00
tigercat2000
add4852d3c Remove purple rose properly 2018-03-06 04:46:17 -08:00
Regen
ff68c12b31 Removes purple hair flower pin 
Removes the purple hair flower pin, as this is my fluff item.

@Tigercat2000 is moving the sprite to the correct folder then he's available.

:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
 2018-03-06 01:36:10 +01:00
Funce
27d3ccbe10 Allow silicons to properly use interface lock UI. 2018-03-05 11:48:40 +13:00
Fox McCloud
e1003f0d83 Merge pull request #8489 from KasparoVy/eyeglow 
Eyes of Humanoids w/ Great Darkview, XRAY Vision, Synthetic Eyes or Eye Implants Shine in the Dark
 2018-03-03 17:20:52 -05:00
tigercat2000
693e188362 Merge pull request #8583 from FalseIncarnate/coffee 
Coffee Mugs and Vendor Change
 2018-03-03 10:32:54 -08:00
FalseIncarnate
3b37c1c48c datum path rename 2018-03-03 13:19:58 -05:00
tigercat2000
2887c4a62f Merge pull request #8710 from Birdtalon/pschye-toys 
A few more things for the Psyche locker.
 2018-03-03 09:59:40 -08:00
tigercat2000
65f0895b64 Merge pull request #8693 from Aurorablade/NecaWTF 
Why Neca
 2018-03-03 09:59:22 -08:00
tigercat2000
d92616c948 Merge pull request #8660 from Tayyyyyyy/ai_status 
Port tg AI status panel
 2018-03-03 09:59:06 -08:00
tigercat2000
aca2769324 Merge pull request #8681 from DarkPyrolord/BluespaceSlices 
Fixes bluespace bread (and other slice foods as well)
 2018-03-03 09:30:23 -08:00
tigercat2000
087457fa9b Merge pull request #8675 from Serkket/001 
Bug-B-Gone
 2018-03-03 09:28:12 -08:00
Citinited
8d559ab9b3 fixes posibrains going to nullspace after losing at russian roulette 2018-03-02 21:44:58 +00:00
Citinited
c6cc30ff8c Fixes a runtime that can be caused by headless IPCs 2018-03-02 21:39:48 +00:00
FalseIncarnate
060117f5c3 novelty datums 2018-02-28 22:13:38 -05:00
tigercat2000
b8b5795636 Merge pull request #8704 from Aurorablade/SkrellHair 
New hair for Skrell and one for Taja
 2018-02-24 19:19:23 -08:00
Birdtalon
904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
Aurorablade
86f25c5e7f fixes some words... 2018-02-21 23:31:43 -05:00
Fox McCloud
010d8d5eca Merge pull request #8651 from uraniummeltdown/titaniummineral 
Titanium
 2018-02-21 03:20:20 -05:00
Aurorablade
63537a050b new hair 2018-02-21 01:36:17 -05:00
uraniummeltdown
edda7c9c52 make power tools and abductor tools use titanium 2018-02-21 11:09:47 +05:00
Fox McCloud
d028ad1ee9 Merge pull request #8314 from Anasari/FireFight 
Port Paper Plane
 2018-02-20 21:12:21 -05:00
Ansari
1e0a4645db fix 2018-02-21 08:28:26 +08:00
DarkPyrolord
2b2bedee9b Tired code is shitcode 2018-02-21 13:11:27 +13:00
Terilia
252eccd7e0 Forgot to add the Char Name and Ckey 2018-02-20 14:21:49 +00:00
DarkPyrolord
ddf32096f0 I should get more sleep 2018-02-21 01:05:33 +13:00
Ansari
0acc32b103 Finally 2018-02-20 19:47:09 +08:00
Fox McCloud
6c7ab652a2 Merge pull request #8667 from Birdtalon/papertime 
Time tag for paperwork
 2018-02-20 06:00:11 -05:00
DarkPyrolord
0f8533ea18 Tiger Fixes 2018-02-20 22:34:45 +13:00
Fox McCloud
e4678d1a9f Merge pull request #8568 from MarcellusPye/SulphAcidNoMore 
Lets grays drink sulphuric acid
 2018-02-20 04:16:11 -05:00
Ansari
b3968ce180 woops 2018-02-20 16:11:42 +08:00
Ansari
bcdc6af7f1 Fixes 2018-02-20 16:08:49 +08:00
MarcellusPye
a426b93a7a Maintainer corrected comments 2018-02-20 19:45:57 +13:00
MarcellusPye
8235d8ec89 Calls parent 2018-02-20 19:38:55 +13:00
tigercat2000
f73c3c01d8 Merge pull request #8418 from Fox-McCloud/disco-inferno 
Adds Dance Machine
 2018-02-19 22:04:01 -08:00
Fox McCloud
0f0f7e13c6 Merge pull request #8444 from HugoLuman/whalecough 
Adds coughing and sneezing sounds for Drask
 2018-02-20 00:48:09 -05:00
tigercat2000
ff06bf8854 Merge pull request #8430 from Fox-McCloud/ied-buff 
Buffs IEDs
 2018-02-19 21:45:05 -08:00
Aurorablade
17bf70cb36 reduces volume to 70 2018-02-18 20:04:13 -05:00
Aurorablade
e38552b3a2 no really 2018-02-16 20:27:37 -05:00
florodude
4376f8f974 fixes #8680 
Changed frabricated to fabricated.
 2018-02-15 00:05:36 -06:00
DarkPyrolord
fb5d048dbd Bluespace B Gone 2018-02-14 02:29:39 +13:00
Crazy Lemon
8979e2428d Merge pull request #8410 from tigercat2000/client_dir 
Client dir compatibility, part 1
 2018-02-11 16:40:44 -08:00
Serket
8930359edc MapMerge/SpeciesCheck 2018-02-11 16:03:27 -07:00