cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-21 23:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,970 Commits 28 Branches 2 Tags
fa1aa894ea0149d129255ecb97f5c8298b7b23a4
Commit Graph

3633 Commits

Author SHA1 Message Date
Aurorablade
fa1aa894ea Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-12-01 18:04:07 -05:00
Crazylemon64
e212308cac The RCD making doors no longer has a shallow copy 
This means that changing accesses on the RCD will no longer
change accesses made on prior doors
 2016-11-28 02:25:05 -08:00
Crazy Lemon
b769147449 Merge pull request #5897 from FlattestGuitar/e20 
e20 gets logged now
 2016-11-23 13:22:16 -08:00
Aurorablade
0c637cebfa Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into BookClub 2016-11-22 01:48:56 -05:00
Crazy Lemon
405fe1bb54 Merge pull request #5842 from Fox-McCloud/reagent-reorganization 
Reagent Reorganization
 2016-11-21 16:54:41 -08:00
Mieszko Jędrzejczak
7874bba921 e20 get logged 2016-11-20 01:42:22 +01:00
KasparoVy
0b23981f1b Fix. 
The spawnable DNA Injectors containing powers (XRay, etc.) will now
activate/deactivate the powers correctly.
 2016-11-19 18:29:43 -05:00
Aurorablade
5d392b36a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-11-15 15:30:36 -05:00
TheDZD
9807576359 Merge pull request #5875 from Fox-McCloud/vision-fix 
Fixes Simple Mobs Attacking Pods/Mechs Across Z-Levels
 2016-11-13 19:52:24 -05:00
Fox-McCloud
55ffd16db8 Fixes Telekinetic Simple Mobs 2016-11-11 10:39:50 -05:00
Aurorablade
4b717c7712 BUILDABLE cult door... 2016-11-10 02:44:21 -05:00
Crazylemon64
6ec712df8c Fixes defib leaving people in deadchat, n2o paralyse time 2016-11-06 21:36:24 -08:00
Fox-McCloud
61da53cca1 create reagents proc 2016-11-06 14:37:47 -05:00
Aurorablade
23e392f0ef Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-31 22:38:14 -04:00
Fox McCloud
911fa70e1a Merge pull request #5601 from Crazylemon64/status_effect_overhaul 
Ports over the status effect unification from the extreme refactor
 2016-10-30 22:40:24 -04:00
Markolie
a77b501ebf Runtime fix 2016-10-27 15:03:07 +02:00
Markolie
4dcb46d295 More minor briefcase changes 2016-10-27 15:00:31 +02:00
Markolie
e9dc5b1b1f Fix secure briefcases appearing empty 2016-10-27 14:56:58 +02:00
Aurorablade
0a265f963c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-24 22:30:16 -04:00
Fox McCloud
5fb35e7b23 Merge pull request #5809 from Markolie/idchecks 
Fix up a number of ID checks
 2016-10-24 15:52:01 -04:00
Crazylemon64
6a7f7394a8 Ports over the status effect unification 2016-10-23 15:45:35 -07:00
Markolie
79be3ca8cf Fix up a number of ID checks 2016-10-23 15:49:02 +02:00
TheDZD
062a14f2af Merge pull request #5795 from Fox-McCloud/null-rod-cleanup 
Nullrod istype Helpers
 2016-10-22 09:35:16 -04:00
Markolie
1a307cd8c9 Identity theft objective set fix, tank examine fix, proccall null return fix 2016-10-21 17:51:38 +02:00
Markolie
7173a8fe9f Fix aliens double attacking, tank examining and ATM security level 0 interaction 2016-10-21 17:21:23 +02:00
Markolie
87920451e8 Fix robot lockdown through console and jetpack examine 2016-10-21 17:02:16 +02:00
Fox-McCloud
1da17e6863 Nullrod istype Helpers 2016-10-19 03:09:17 -04:00
Fox McCloud
977d73740f Merge pull request #5780 from Bone-White/master 
Fix for issue #5768
 2016-10-17 19:16:21 -04:00
Bone White
b40f37444c Fix for issue #5768 
Correctly un-wields defib paddles when dropping.
 2016-10-16 15:36:01 +01:00
Markolie
e60e93e706 Fix light fixture frame progress bar 2016-10-15 12:47:38 +02:00
Aurorablade
e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Mieszko Jędrzejczak
8cef21f3fe pais don't gib on wipe 2016-09-26 17:04:34 +02:00
KasparoVy
ffc0083098 bottlefix 2016-09-18 01:06:47 -04:00
Fox McCloud
c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs 
Adds Unique Identifiers with Topic and VV Integration
 2016-09-12 15:32:20 -04:00
Fox McCloud
f5e9b7aadf Merge pull request #5665 from LittleBigKid2000/dna-scrambler-fix 
Fixes DNA scrambler not having an icon
 2016-09-12 15:11:09 -04:00
Fox McCloud
336d37a36f Merge pull request #5624 from Kyep/syndie_radio 
Creates Syndicate Team Radio Frequency
 2016-09-12 14:36:31 -04:00
GeneralChaos81
c5e9b0514f Redo of clown/mime door fix. 2016-09-12 20:11:54 +10:00
Isaac Erwin
ea826aa949 Fixes DNA scrambler not having an icon 2016-09-11 23:44:27 -04:00
Aurorablade
f1aada7ea1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-09-11 19:50:53 -04:00
Krausus
d64bf46f12 Topic UID finishing touches 2016-09-08 13:07:14 -04:00
Fox McCloud
20d0674ebf Merge pull request #5606 from FlattestGuitar/kits 
Adds Emergency Plasma/Nitrogen Tanks to Medical Storage
 2016-09-07 18:44:35 -04:00
Krausus
d146de1dd7 UID mass replace: src=\ref[datum] 2016-09-05 23:12:08 -04:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Kyep
02ffbd084e Creates Syndicate Team Radio Frequency 2016-09-05 03:35:29 -07:00
Fox McCloud
3b2cbcd57c Merge pull request #5619 from CyrusJazzberry/patch-8 
Fixes misc grammar and adds new attack messages
 2016-09-05 00:08:08 -04:00
Fox McCloud
34acbdda6e Merge pull request #5615 from CyrusJazzberry/patch-6 
Adds new violin attack messages
 2016-09-05 00:07:42 -04:00
Jazzdoodle
618df20380 Update misc.dm 2016-09-04 15:05:14 -05:00
Jazzdoodle
1c5953f01a Fixes misc grammar and adds new attack messages 
Cleans up the grammar of the Desk Fan and Ball Toy. Additionally, some new attack messages are added to the Red Phone and Cane.
 2016-09-03 21:00:46 -05:00
Fox McCloud
778d8909f9 Merge pull request #5592 from TheDZD/leapnerf 
Makes Shields Counter Xeno Leap More Effectively
 2016-09-03 20:22:45 -04:00
Jazzdoodle
2add1859c1 Adds new violin attack messages 
Adds a few funny attack messages, including 'strung' and 'fiddled'.
 2016-09-03 16:00:51 -05:00