cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,787 Commits 26 Branches 2 Tags
00a39f5c83f929b87b0baa16ba879b4245d3d622
Commit Graph

12559 Commits

Author SHA1 Message Date
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Fox McCloud
c0d5ef387a Merge pull request #3918 from Tastyfish/aliums 
Fixes alium larvae polling repeatedly
 2016-03-18 03:49:22 -04:00
Tastyfish
f4ea29fc43 Aliums polling forever because of organ change 2016-03-18 01:21:34 -04:00
TheDZD
0ac7c0d4cd Merge pull request #3915 from Crazylemon64/multibrain_fix_v2 
Fixes multibrain weirdness... Again.
 2016-03-17 17:23:59 -04:00
Crazylemon64
09f10f3e98 Fixes multibrain weirdness 2016-03-17 13:44:21 -07:00
TheDZD
d43f1c5047 Merge pull request #3904 from TravellingMerchant/Kidan-Spirte-Update 
I made some new sprites for Kidan.
 2016-03-17 15:26:18 -04:00
TheDZD
88fa2d5b24 Merge pull request #3901 from Fox-McCloud/cable-coils 
Can Make Cable Coils in Autolathes
 2016-03-16 23:20:31 -04:00
TheDZD
85e2f1f0ab Merge pull request #3898 from Fox-McCloud/addiction-rework 
Addiction Rework
 2016-03-16 21:46:18 -04:00
TheDZD
723e150d28 Merge pull request #3896 from Fox-McCloud/heart 
Heart Tweaks
 2016-03-16 21:45:59 -04:00
Fox McCloud
ba24d3309a Merge pull request #3881 from DaveTheHeadcrab/snowflaekShit 
DaveTheHeadcrab - Fluff items
 2016-03-16 21:36:30 -04:00
Fox McCloud
a5f33c9859 Merge pull request #3885 from Tastyfish/shuttle-console 
Allows construction of engi, mining, research, labor shuttle consoles
 2016-03-16 21:25:11 -04:00
Fox-McCloud
af2bfb1dbf fix 2016-03-16 21:22:09 -04:00
Fox-McCloud
4ff472a0ea tweaks 2016-03-16 20:38:56 -04:00
Tastyfish
e8cd1226cb Makes toggling debug logs actually save 2016-03-16 17:20:24 -04:00
TravellingMerchant
41d5061719 I made some new sprites for Kidan. 
I made some new sprites for the Kidan race. They no longer look like a
stick insect.

Support for them has been massive on discord and the forums. Gibs and
body parts all work fine. No clipping issues with clothes beyond the
antenna that the original Kidan have.
 2016-03-16 06:31:44 +00:00
Fox-McCloud
08c06782ee Can Make Cable Coils in Autolathes 2016-03-15 22:40:49 -04:00
TheDZD
16401b4f16 Merge pull request #3858 from Fox-McCloud/changeling-headcrabs 
Implements Changeling Headcrabs
 2016-03-15 21:01:34 -04:00
TheDZD
0f7b5462f4 Merge pull request #3862 from Fox-McCloud/spider-eggs 
Implements Infectious Spider Eggs
 2016-03-15 20:59:05 -04:00
Fox-McCloud
efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00
Fox-McCloud
35607d76da Heart Tweaks 2016-03-15 13:15:09 -04:00
Fox McCloud
04b5837a8e Merge pull request #3875 from FalseIncarnate/master 
Fixes Hardsuits Not Auto-deploying Attached Boots and Helms
 2016-03-15 11:17:49 -04:00
Fox McCloud
6dfbcb5dcc Merge pull request #3871 from Tastyfish/chronx2 
fluff tweaks
 2016-03-15 11:17:15 -04:00
Fox McCloud
bad5eb6b2e Merge pull request #3865 from tigercat2000/tgcam 
Port -tg-station cameranets
 2016-03-15 11:04:25 -04:00
TheDZD
a858cb75a0 Merge pull request #3770 from tigercat2000/sneks 
Enabled the admin-only snake body with sprites from @johannhawk <3
 2016-03-14 19:47:17 -04:00
SamCroswell
86a568cc05 Removes dupe definiton (Derp) 2016-03-14 18:10:39 -04:00
Tastyfish
505c13a6d2 Allows construction of engi, mining, research, labor shuttle consoles 2016-03-14 18:10:36 -04:00
Tigercat2000
b397ac11a8 RAAAAAAAAAAWR. 2016-03-14 15:01:27 -07:00
SamCroswell
c1f26fac4e Fixes the tat gun 2016-03-14 17:51:27 -04:00
Tigercat2000
296e689e7e Merge remote-tracking branch 'upstream/master' into tgcam 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2016-03-14 14:45:21 -07:00
TheDZD
bf371094ee Merge pull request #3817 from Fox-McCloud/screaming 
Screamtastic
 2016-03-14 17:43:29 -04:00
Tigercat2000
562a70fcdf Is all good now, yaya. 2016-03-14 14:43:11 -07:00
TheDZD
7ee864d60e Merge pull request #3873 from Fox-McCloud/eye-augment-fix 
Fix Eye Augment EMP
 2016-03-14 16:39:18 -04:00
SamCroswell
cee1be8bed Remove's Atani's define 2016-03-14 16:18:21 -04:00
SamCroswell
8a5e293af0 Fluff-O-Rama 2016-03-14 16:15:50 -04:00
Fox-McCloud
55a36bbff1 isturf 2016-03-14 15:03:14 -04:00
Fox McCloud
55f6134b10 Merge pull request #3876 from Tastyfish/doors-fuck 
Derped and forgot to update shuttle dock doors
 2016-03-14 08:10:11 -04:00
Tastyfish
ddbd833d7d Derped and forgot to test shuttle door checks 2016-03-14 08:03:55 -04:00
FalseIncarnate
0ffb649278 Fixes Hardsuits Not Auto-deploying Boots and Helms 
Apparently slots don't get set before equipped() is called, so a
spawn(1) fixed this.
 2016-03-14 07:03:46 -04:00
Fox-McCloud
bb9aab416e Fix Eye Augment EMP 2016-03-14 06:20:21 -04:00
Tastyfish
96e0d10f8e flavor tweaks 2016-03-14 05:26:05 -04:00
Fox McCloud
1e5c7e709e Merge pull request #3869 from Tastyfish/audible_emote 
Fixes *beep etc to be audible emotes
 2016-03-14 04:43:43 -04:00
Tastyfish
c3de0cf196 Removes picture frames 2016-03-14 04:35:35 -04:00
Tastyfish
31a3313930 Fixes *beep etc to be audible emotes 2016-03-14 03:20:29 -04:00
Fox-McCloud
36905da472 IPC scream 2016-03-14 01:09:23 -04:00
TheDZD
2254815612 Merge pull request #3857 from Fox-McCloud/xeno-tweaks 
Xeno Tweaks and Fixes
 2016-03-13 22:47:54 -04:00
Fox McCloud
be00b4e4ae Merge pull request #3866 from Tastyfish/talk 
Fixes "talks but you cannot hear them" message
 2016-03-13 22:37:48 -04:00
Tastyfish
bd7a83e79e Fixes "talks but you cannot hear them" message 2016-03-13 22:18:38 -04:00
Fox McCloud
74838a86f8 Merge pull request #3854 from FlattestGuitar/synthanol_3 
Synthanol Upgrade v2
 2016-03-13 21:15:32 -04:00
Mieszko Jędrzejczak
01fbaad358 Holy water is water. 2016-03-14 02:09:11 +01:00
Fox McCloud
8ea7ac01c3 Merge pull request #3838 from Crazylemon64/slime_blood_work_right_dangit 
Skeletons, Slime people, and other bloodless races no longer bleed
 2016-03-13 21:08:47 -04:00