cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 15:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,308 Commits 26 Branches 2 Tags
c514b4e34af8ec81765a2cd14a51a373fd38388a
Commit Graph

16513 Commits

Author SHA1 Message Date
variableundefined
6549234b8c Merge pull request #10968 from Fox-McCloud/his-grace 
His Grace Binds His Will
 2019-03-07 08:49:05 +08:00
Fox McCloud
e7f8cca24a The World Can Burn For All I Care 2019-03-03 11:06:31 -05:00
variableundefined
62ae0a46a3 Merge pull request #10971 from Arkatos1/Cloned-Cult-Commune-Fix 
Fixes #10815 - Cloned cultists now retain their Commune ability
 2019-03-03 22:54:46 +08:00
variableundefined
682e7b453e Merge pull request #10948 from datlo/hijackprisonners 
Allow hijackers to take hostages
 2019-03-03 22:37:48 +08:00
variableundefined
09da0c9fe1 Merge pull request #10983 from Dave-TH/medbay_qol 
Medical QOL Bugfix - Round 2
 2019-03-03 22:27:15 +08:00
Dave
7e9061f44d Medical QOL Bugfix - Round 2 2019-03-03 00:24:41 -05:00
Fox McCloud
56ec3b8783 Merge pull request #10982 from Dave-TH/medbay_qol 
Anchors Defib Mounts
 2019-03-02 23:42:10 -05:00
Dave
f883e9626e WHOOPS 2019-03-02 23:19:47 -05:00
variableundefined
fbf6f3617e Merge pull request #10980 from Fox-McCloud/fixes-genetics 
Fixes Genetic Powers Activation
 2019-03-03 08:52:52 +08:00
Fox McCloud
b39a54c95a Fixes Genetic Powers Activation 2019-03-02 19:33:53 -05:00
Fox McCloud
8318ca338c tweaks 2019-03-02 10:10:04 -05:00
Fox McCloud
6bd0ecfab0 tweaks 2019-03-02 10:03:09 -05:00
Arkatos1
c1b723bb00 Proper spacing 2019-03-02 01:45:55 +01:00
Dave
ebe99e8986 Applies what my mom taught me about conflict resolution 2019-03-01 18:51:04 -05:00
Arkatos1
355f3b660a Fixes the issue when cloned cultists did not get their ability to commune 2019-03-01 22:24:01 +01:00
Fox McCloud
185f5d5fd6 better code, fixes, and tweaks 2019-03-01 00:09:48 -05:00
Fox McCloud
b47057b452 whoops 2019-02-28 19:18:12 -05:00
Fox McCloud
705a4c27a0 His Grace Binds His Will 2019-02-28 19:12:48 -05:00
joep van der velden
21ad3954bf can't use when unconcious or dead now 2019-03-01 00:15:28 +01:00
variableundefined
edef1bd11e Merge pull request #10962 from Fox-McCloud/fixes-stacks 
Fixes Stacks--Again
 2019-02-28 20:45:03 +08:00
variableundefined
c5156b7827 Merge pull request #10957 from Kyep/genetic_block_injector_fix 
Fixes #10952 - broken SE block injectors
 2019-02-28 19:16:53 +08:00
Kyep
ebf2ebc6b8 Fox suggestions 2019-02-27 18:33:10 -08:00
Fox McCloud
f133be6760 Fixes Stacks--Again 2019-02-27 09:29:29 -05:00
variableundefined
459228a81c Merge pull request #10836 from datlo/navconsoles2 
Revives Shuttle Navigation Computers to all syndicate shuttles + Vox/ERT
 2019-02-27 22:26:08 +08:00
Kyep
513ed740f1 Fixes broken SE block injectors 2019-02-26 19:26:24 -08:00
variableundefined
db26f9bcc4 Merge pull request #10892 from UmeFuu/master 
New cookies recipe (previous one was a bit silly)
 2019-02-26 17:04:31 +08:00
variableundefined
2ddc16970c Merge pull request #10947 from Fox-McCloud/adds-upgraded-heart 
Adds Upgraded Cybernetic Heart
 2019-02-26 17:01:50 +08:00
UmeFuu
923e372926 Deletes leftover code 2019-02-25 21:55:52 -03:00
variableundefined
8266a732bf Merge pull request #10885 from datlo/freegolemtweaks 
Free Golems tweaks
 2019-02-26 08:43:47 +08:00
variableundefined
9d5c8dda29 Merge pull request #10938 from datlo/magicmirrorvoice 
Adds "voice" option to magic mirror
 2019-02-26 08:07:31 +08:00
datlo
24ef06d249 Allow hijackers to take hostages 2019-02-25 14:29:58 +00:00
Fox McCloud
b8a9f127bf Adds Upgraded Cybernetic Heart 2019-02-25 01:15:53 -05:00
variableundefined
855de06162 Merge pull request #10925 from Fox-McCloud/fix-blind-block 
Fixes Blindness Mutation Not Working
 2019-02-24 21:04:39 +08:00
Dave
e5d01311d6 Review Concerns 2019-02-23 23:00:53 -05:00
datlo
951f9c4928 add "voice" option to magic mirror 2019-02-22 02:05:34 +00:00
datlo
673ecd288e antag clowns can toggle clumsy on and off 2019-02-19 20:33:36 +00:00
Fox McCloud
863a8b6bfb Fixes Blindness Mutation Not Working 2019-02-19 04:43:43 -05:00
Dave
5664206697 review changes 2019-02-17 14:44:49 -05:00
Dave
5d536f4c09 Defib QDEL_NULL 2019-02-16 10:40:07 -05:00
datlo
91792b09c1 Prevent objectives from targetting offstation roles 
also remove nukie flavor text and prevent golem targetting
 2019-02-16 15:09:25 +00:00
variableundefined
f6ce6af91e Merge pull request #10898 from Mitchs98/booze 
Booze/Soda Dispenser Changes.
 2019-02-16 18:42:43 +08:00
variableundefined
4df2c24fe9 Merge pull request #10903 from farie82/why-is-this-here 
Removes some special cases for the chaplains religion
 2019-02-16 07:34:09 +08:00
Dave
c16702e235 Slight tweaks 2019-02-15 17:31:56 -05:00
datlo
33eb050f3d Merge branch 'master' into freegolemtweaks 2019-02-15 16:04:43 +00:00
Unknown
3523a48d89 IV Drip Wheel Sound 2019-02-15 00:15:35 -05:00
Unknown
5ab0af3b25 Medical QoL PR 2019-02-15 00:10:08 -05:00
variableundefined
7a3906eb95 Merge pull request #10882 from Aurorablade/ConvertFix 
Redundent cult convert checks
 2019-02-15 07:51:50 +08:00
Aurorablade
9c2ae99491 Removes isanimal check 2019-02-14 17:04:42 -05:00
variableundefined
d1ce7e6085 Merge pull request #10879 from datlo/stationdisk 
Prevent ERT/Abductors/Traders/etc from stealing dat disk
 2019-02-14 21:37:47 +08:00
variableundefined
e217ee4387 Merge pull request #10877 from TDSSS/NT-rep-access-change 
Remove HOP access from NT rep, Magistrate
 2019-02-14 21:37:22 +08:00