cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-23 16:03:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,848 Commits 29 Branches 2 Tags
1212c9dde56f433d33b99ae43bf7fb79de9649bb
Commit Graph

12604 Commits

Author SHA1 Message Date
TheDZD
1212c9dde5 Merge pull request #3943 from KasparoVy/ipc-fbp-emergency-fix 
ASAP Fix, Character Configuration - Prosthetic Typo
 2016-03-20 19:14:28 -04:00
KasparoVy
5ffc070a4f FIX 2016-03-20 19:01:52 -04:00
TheDZD
854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved 
IPC-FBP Customization
 2016-03-20 18:43:51 -04:00
Fox McCloud
3bde57e65c Merge pull request #3905 from Aurorablade/GuardianUpdate 
Antagus Minor:Spritus
 2016-03-20 18:40:26 -04:00
Fox McCloud
1d2bfbf044 Merge pull request #3940 from Tastyfish/sdqlcall 
Fixes SDQL's CALL
 2016-03-20 15:38:50 -04:00
Tastyfish
87745262f3 Fixes SDQL's CALL 2016-03-20 15:19:25 -04:00
KasparoVy
1d54698b02 Fix 2016-03-20 13:13:12 -04:00
TheDZD
609efbc2db Merge pull request #3933 from Fox-McCloud/fixes-hivenod 
Fixes Xeno Hive Node Languages
 2016-03-20 12:50:11 -04:00
Fox-McCloud
e0665336e0 Fixes Xeno Hive Node Languages 2016-03-20 03:16:22 -04:00
Fox McCloud
b6298ac1c1 Merge pull request #3922 from Crazylemon64/mitocholide_organ_rejuv 
Organs can now be made viable again with an application of mitocholide
 2016-03-20 00:17:13 -04:00
Tigercat2000
7c4fb674d9 Fix my broken ass allowed() proc 
mob.get_access() now returns a list of all the accesses a mob has in X
slots
.... basically it behaves the same as it used to.
 2016-03-19 20:45:42 -07:00
TheDZD
e3b9b279c6 Merge pull request #3906 from Fox-McCloud/regen-tweaks 
Tweaks Regeneration Mutation
 2016-03-19 22:47:13 -04:00
Fox McCloud
8696d7992b Merge pull request #3925 from Tastyfish/chatroom 
Adds PDA chatroom app
 2016-03-19 22:19:06 -04:00
Fox McCloud
f8c0b9a3de Merge pull request #3923 from tigercat2000/access 
Refactor allowed() proc.
 2016-03-19 21:16:48 -04:00
KasparoVy
760f956cf7 Drops some excess brackets. 2016-03-19 04:27:12 -04:00
Crazylemon64
f8d19fa9e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into mitocholide_organ_rejuv 2016-03-18 20:17:39 -07:00
Crazylemon64
eb04645aea Fixes fox's thing 2016-03-18 20:16:02 -07:00
Fox McCloud
d4b2782f4b Merge pull request #3849 from Aurorablade/BeepBeep 
god its late Fixes #3908
 2016-03-18 21:40:53 -04:00
Fox McCloud
0d24763e35 Merge pull request #3920 from Crazylemon64/cleaner_dna_application 
Makes DNA swapping methods more reliable and other appearance tweaks
 2016-03-18 21:37:20 -04:00
Aurorablade
ac5968fb84 I FORGOT THE FEEET! 2016-03-18 21:25:31 -04:00
Aurorablade
300cd8b840 nomoredaemonspaces 2016-03-18 21:19:24 -04:00
Aurorablade
b9fd5042f6 look ma, hands.... 2016-03-18 21:13:29 -04:00
Aurorablade
72344f082d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BeepBeep 2016-03-18 20:59:01 -04:00
Fox McCloud
17e3f02b5d Merge pull request #3903 from taukausanake/MouseFix 
Held mice sprite fix
 2016-03-18 20:53:31 -04:00
Aurorablade
ff798ae9ec This is the exact file from the master branch of the Repo 2016-03-18 20:53:28 -04:00
Aurorablade
83d3e392ae Revert "OMG CONFLICT R GRIFFING ME HALP" 
This reverts commit fd65c752bf.
 2016-03-18 20:40:54 -04:00
Aurorablade
fd65c752bf OMG CONFLICT R GRIFFING ME HALP 2016-03-18 20:32:36 -04:00
Crazylemon64
8270e1edef pAIs and drones are now vulnerable to EMPs when held 2016-03-18 14:54:00 -07:00
Tastyfish
7c3667ecb8 Adds PDA chatroom 2016-03-18 16:45:12 -04:00
Tigercat2000
009bef4420 Refactor allowed() proc. 2016-03-18 12:02:38 -07:00
Crazylemon64
d41ab52515 Stop eating my changes 2016-03-18 11:16:21 -07:00
Crazylemon64
3077a397de Adds necrotic organ detection to the advanced med scanner 2016-03-18 11:14:13 -07:00
Aurorablade
bffb90d392 removes somethings... 2016-03-18 14:06:36 -04:00
Crazylemon64
33f6facdb4 Organs can now be made viable again with an application of mitocholide 2016-03-18 09:14:35 -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
Crazylemon64
c379361305 Brains now rename on removal and insertion 2016-03-17 23:36:22 -07:00
Crazylemon64
d748ef23b8 Makes DNA swapping methods more reliable 
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
 2016-03-17 23:07:45 -07:00
Tastyfish
f4ea29fc43 Aliums polling forever because of organ change 2016-03-18 01:21:34 -04:00
Aurorablade
be74bf8745 ......dammitiger 2016-03-18 00:59:11 -04:00
KasparoVy
98285c0518 No longer, I hope. 2016-03-17 20:37:41 -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
Aurorablade
4a2bd5cc16 infection surgery edit 2016-03-17 02:09:41 -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