cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 13:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,150 Commits 26 Branches 2 Tags
f691e08deb310ecc90efbdf2deef277ecf04f92d
Commit Graph

27674 Commits

Author SHA1 Message Date
Aurorablade
f691e08deb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RingRingHello 2018-03-25 23:15:37 -04:00
Alffd
39d93654f4 Remove stun 2018-03-25 22:47:12 -04:00
Alffd
8c86e9a08d Changes to pathing calculations, prevent wasted calculations 2018-03-25 22:46:22 -04:00
Alffd
82c20d0041 Updated for SSair 2018-03-25 21:49:02 -04:00
tigercat2000
338631744f Merge pull request #8798 from Fox-McCloud/fire-subsystem 
Ports over Fires to Subsystems
 2018-03-25 16:02:31 -07:00
Fox McCloud
7a548473d4 name 2018-03-25 18:52:06 -04:00
Crazy Lemon
f435e06206 Merge pull request #8796 from alexkar598/floorfix 
Examining holo floors will no longer hang the game(or should no longer)
 2018-03-25 14:39:44 -07:00
tigercat2000
40da304f1e Merge pull request #8806 from matt81093/cyborg_meson 
Fixes #8797 : Borg vision resets
 2018-03-24 13:43:18 -07:00
uraniummeltdown
7805d3a340 fixes runtime with manually deconstructing airlocks made by RCD on default settings 2018-03-24 17:23:28 +04:00
Matthew Kelley
f0784af617 Resets borg special vision when reset 2018-03-24 01:29:00 -05:00
tigercat2000
e6cc32d1b6 Merge pull request #8803 from shazbot194/More_Jackets 
Updates Patch's Jacket icons and adds some more colors
 2018-03-23 19:56:28 -07:00
shazbot194
a3183ee485 Upadates Patch's Jacket icons and adds some more colors 2018-03-23 17:42:59 -08:00
Fox McCloud
ae53aa1d21 Ports over Fires to Subsystems 2018-03-23 18:03:27 -04:00
Fox McCloud
bc7d9aa02d Merge pull request #8723 from tigercat2000/SMC 
StonedMC
 2018-03-23 16:48:34 -04:00
alexkar598
d4b0e56708 Examining holo floors will no longer hang the game(or should no longer) 2018-03-23 16:08:38 -04:00
MINIMAN10000
68ff13fe3a Add "One access" to non secure windoor #5973 
Secure windoor has conditions for "One" and "All" access but default windoor only has "All" access. This adds "One" and "All" access to default windoor. Fixes #5973
 2018-03-22 20:25:37 -07:00
tigercat2000
c4449fea39 Whoops 2018-03-22 15:41:33 -07:00
tigercat2000
47f1e2c1e4 Address Fox's concerns 2018-03-22 15:39:41 -07:00
tigercat2000
b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC 
# Conflicts:
#	code/__DEFINES/flags.dm
 2018-03-22 15:35:12 -07:00
tigercat2000
b1278de3d2 Merge pull request #8674 from uraniummeltdown/attacks 
[READY] Attack Code Update
 2018-03-22 11:55:53 -07:00
tigercat2000
61858f580d Merge pull request #8776 from MarsM0nd/xray_machine 
Fixes xray machines
 2018-03-21 10:16:12 -07:00
tigercat2000
f5940155ca Spacing fixes. 2018-03-20 19:12:55 -07:00
tigercat2000
d88a17a0f4 Fix runtimes, remove world init BS, UpdateTickRate() 2018-03-20 18:32:45 -07:00
alexkar598
bcae1222e1 i should of kept it as it was huh 2018-03-20 19:25:43 -04:00
alexkar598
df70fc1b6d whoopsy 2018-03-20 17:26:32 -04:00
alexkar598
13d02eb490 makes stun prods great again 2018-03-20 17:21:21 -04:00
Mars
8be770ed5d Icon is named pill, not pills 2018-03-20 18:19:45 +01:00
Fox McCloud
53bb5eaf35 Vulp Hunger Hotfix 2018-03-19 19:37:35 -04:00
tigercat2000
01c441be37 Merge pull request #8654 from shazbot194/Scarab_sprites 
New Scarab Sprite
 2018-03-19 13:53:35 -07:00
tigercat2000
50f9d695a5 Merge pull request #8124 from Aurorablade/Dreams 
Byond the wall of sleep
 2018-03-19 13:42:00 -07:00
tigercat2000
5a756ad3c9 Merge pull request #8708 from Birdtalon/nanocalcium 
Nanocalcium: Bone repair drug.
 2018-03-19 13:37:20 -07:00
tigercat2000
6f5a666b1a Merge pull request #8284 from Aurorablade/CultPassBug 
Cult pass split: Bugs and runes
 2018-03-19 13:28:36 -07:00
shazbot194
0a9a3c2b2b More icons for the M90 (#8738) 2018-03-19 13:20:31 -07:00
tigercat2000
6e9ee2e822 Revert ".357 nukie price fix" 2018-03-19 13:15:01 -07:00
tigercat2000
3a6cc2557e Merge pull request #8737 from shazbot194/357_price_fix 
.357 nukie price fix
 2018-03-19 13:14:32 -07:00
tigercat2000
7bee9ab6dc Merge pull request #8761 from IK3I/WrathOfSinguloth 
Bags of bags of holding no longer possible.
 2018-03-19 11:54:52 -07:00
tigercat2000
de46e81793 Merge pull request #8775 from Birdtalon/take 
Re-adds "Take" shortcut into admin help
 2018-03-19 11:29:09 -07:00
tigercat2000
cd6b8dfe45 Merge pull request #8566 from Aurorablade/BuffsVulpkanin 
Tips the Scales
 2018-03-19 11:27:35 -07:00
Mars
97bf998e61 Fixes xray machines 
The xray machine did only check the exterior, if it was a dangerous
object. Now it recoursivly goes through the contents of the items, to
see if a dangerous object is within.
 2018-03-19 14:15:34 +01:00
Birdtalon
f7d96d8cfe re-adds take shortcut into adminhelp 2018-03-19 11:27:21 +00:00
Aurorablade
2e74bcd4d5 Why this no commit? 2018-03-19 02:05:37 -04:00
Aurorablade
6aec682631 Diona needing water revert 
Still have hair.
 2018-03-19 02:05:16 -04:00
Aurorablade
737a1575ff NYAH 2018-03-19 01:44:48 -04:00
Aurorablade
13212ee27c Style Tweaks 2018-03-18 23:44:38 -04:00
Mars
db762b4b68 Makes message monitors fixable 
The stat does get checked later on by the machinery parent type, which
already does stop using the console, screwdriver are handled at that
point, and this stopped screwdriver from fixing the broken stat.
 2018-03-15 12:58:57 +01:00
IK3I
e9f3ee5cf5 No. 2018-03-13 22:48:23 -05:00
Aurorablade
59cbd79cc3 Fine, no typo 2018-03-13 22:31:27 -04:00
Aurorablade
2a3dd305a9 Obscure Admin Related fixes 2018-03-13 22:22:51 -04:00
tigercat2000
c4d4c3e23a Merge pull request #8733 from PigeonLord/nabber 
Added Medical Marijuana Packets for the Psychologist
 2018-03-13 04:58:04 -07:00
tigercat2000
27314fded9 Merge pull request #8752 from Citinited/pipes-exploit-fix 
Restricts RPD use to certain turf types
 2018-03-13 04:57:15 -07:00