This website requires JavaScript.
c8fbc20f24
Merge pull request #6570 from Citadel-Station-13/upstream-merge-37410
2018-04-29 22:28:42 +00:00
51eb05b7bd
Fixes gas fusion power not being taken into account
2018-04-29 17:18:30 -05:00
187f27983c
Merge pull request #37535 from cyclowns/fusion-fix
2018-04-30 10:20:01 +12:00
07ddf358c7
Merge pull request #6571 from Citadel-Station-13/upstream-merge-37504
2018-04-29 16:43:49 -05:00
c33ab6221b
Removes an unnecessary file causing github security warnings on tgui, also updates/downgrades some dependencies to ensure a build
2018-04-29 23:57:58 +03:00
0660d49768
[syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh
2018-04-29 15:21:02 -05:00
fe8e1cd61c
[syou can no longer insert a storage object into itself, and therefore, no longer bohbomb with one boh (#37410 )
2018-04-29 13:22:33 -07:00
969e93f0f7
Fix grammar when cleaning things with the damp rag
2018-04-29 14:27:51 -05:00
ed7b8e7128
Fix grammar when cleaning things with the damp rag
2018-04-29 11:55:42 -07:00
d65abac646
Makes pacifists able to use .50BMG Soporific Rounds
2018-04-29 10:11:43 -05:00
ba4f3c0698
Makes pacifists able to use .50BMG Soporific Rounds (#37506 )
2018-04-29 08:13:12 -07:00
70ed56cb24
fixes a pacifism kill through crushing firelocks!
2018-04-29 10:09:29 -05:00
814dc3f811
fixes a pacifism kill through crushing firelocks! (#37511 )
2018-04-29 08:10:59 -07:00
107aba5d1d
Sprite reorganizing, minor sprite fix for mineral stacks
2018-04-29 10:06:15 -05:00
8dee99740d
Moves all sheet prefix sprite from mining.dmi to stack_objects.dmi and fixes a typo
2018-04-28 14:41:39 -04:00
a3f938ffcc
Fixes invisible turtleneck alt state
2018-04-29 10:04:52 -05:00
1478e17fea
Fixes invisible turtleneck alt state
2018-04-28 03:33:44 -04:00
ac160be09a
Condenses a check
2018-04-29 10:03:39 -05:00
62d6329f56
Condenses a check
2018-04-27 11:03:37 -04:00
c287c3a84c
Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483
2018-04-29 02:29:44 -05:00
71b362e41e
Merge pull request #6547 from Citadel-Station-13/upstream-merge-37473
2018-04-29 02:29:05 -05:00
ab8355968c
Update rped.dm
2018-04-29 02:28:43 -05:00
f606430d2b
Merge pull request #6545 from Citadel-Station-13/upstream-merge-37478
2018-04-29 02:28:14 -05:00
c11c2ba70f
Merge pull request #6544 from Citadel-Station-13/upstream-merge-37479
2018-04-29 02:25:37 -05:00
53ee2ab0a9
Merge pull request #6543 from Citadel-Station-13/upstream-merge-37465
2018-04-29 02:25:10 -05:00
89ffa04958
Merge pull request #6542 from Citadel-Station-13/upstream-merge-37442
2018-04-29 02:24:52 -05:00
eddeff9c34
Merge pull request #6541 from Citadel-Station-13/upstream-merge-37385
2018-04-29 02:24:30 -05:00
44f966d0eb
Merge pull request #6540 from Citadel-Station-13/upstream-merge-37461
2018-04-29 02:24:04 -05:00
e8fdaa1a43
Merge pull request #6539 from Citadel-Station-13/upstream-merge-37453
2018-04-29 02:21:56 -05:00
480882de58
Merge pull request #6538 from Citadel-Station-13/upstream-merge-37449
2018-04-29 02:21:31 -05:00
261e7fa1c1
Merge pull request #6537 from Citadel-Station-13/upstream-merge-37482
2018-04-29 02:21:07 -05:00
0bca7362e3
Merge pull request #6511 from Citadel-Station-13/upstream-merge-37389
2018-04-29 02:20:25 -05:00
57270f84d9
Merge pull request #6493 from Citadel-Station-13/upstream-merge-37299
2018-04-29 02:19:14 -05:00
a5395c730d
Fixes missing icons
2018-04-28 14:54:45 -05:00
db142667b7
Merge pull request #37501 from ShizCalev/icon-fixes
2018-04-28 15:55:56 -04:00
803d3b59fd
Merge pull request #6556 from Citadel-Station-13/upstream-merge-37497
2018-04-28 14:07:24 -05:00
b565ef9171
Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384
2018-04-28 14:07:08 -05:00
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 21:22:28 +03:00
811cc06188
Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436
2018-04-28 01:36:04 -05:00
ec1a16fed0
Merge pull request #6535 from Citadel-Station-13/upstream-merge-37480
2018-04-28 01:35:41 -05:00
d10dcf7cd7
Merge pull request #6534 from Citadel-Station-13/upstream-merge-37445
2018-04-28 01:34:59 -05:00
f33c47db7b
Re-adds and reworks fusion.
2018-04-28 01:01:47 -05:00
9b36d6c4d9
Re-adds and reworks fusion. (#37384 )
2018-04-28 02:01:39 -04:00
7cefdbb489
Replaces a / with * as per Contributing.md [bscrystal.dm]
2018-04-27 21:22:00 -05:00
74a483d350
Merge pull request #37497 from ExcessiveUseOfCobblestone/patch-42
2018-04-28 14:20:58 +12:00
2b2ff05b73
Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
2018-04-27 21:28:13 -04:00
48ef6d2349
Adds log and management tabs to permissions panel
2018-04-28 13:25:56 +12:00
6ed120aad4
NTNet improvements!
2018-04-27 18:23:44 -07:00
dee55fa47d
adds new changeling var that counts actual absorbs, uses it for Spiders ability
2018-04-27 18:22:08 -07:00
7d45e045a3
Uppercases slot defines.
2018-04-28 13:13:56 +12:00
0f020aa296
Fixes obj descs and adds missing ones
2018-04-27 13:21:09 -05:00
b368ab377b
fixes obj descs and adds new ones (#37483 )
2018-04-27 20:20:55 +02:00
50c9817920
Lets quantum pads be used by sillycones properly.
2018-04-27 13:17:52 -05:00
73d5c92c2b
Quantum pad interaction (#37473 )
2018-04-27 11:17:41 -07:00
4850230fc4
Refactors and fixes RPEDs
2018-04-27 20:12:41 +02:00
397d00346b
[s] Fixes turret exploits
2018-04-27 13:12:24 -05:00
185a6c4a90
Fixes turret exploits (#37478 )
2018-04-27 14:11:08 -04:00
d9b413cbb3
Fixes being unable to place a Robotic Factory if it failed to place after the prompt
2018-04-27 13:12:15 -05:00
c9ac7ab2a1
Fixes being unable to place a Robotic Factory (#37479 )
2018-04-27 14:11:25 -04:00
8484209904
Adds logging for PDA explosions
2018-04-27 13:11:02 -05:00
6ea9eaf06d
Adds logging for PDA explosions (#37465 )
2018-04-27 20:10:23 +02:00
70c893a6c8
Fixes jumpToNullSpace
2018-04-27 13:05:45 -05:00
b866e62673
Fixes jumpToNullSpace (#37442 )
2018-04-27 14:04:23 -04:00
7b6a845970
Makes clogged vents scale, and way less powerful.
2018-04-27 13:05:36 -05:00
df3c160d0c
Makes clogged vents scale, and way less powerful. (#37385 )
2018-04-27 20:04:46 +02:00
e0960436bf
Removes the signals on process procs
2018-04-27 13:04:24 -05:00
ce5ccc8498
Removes the signals on process procs (#37461 )
2018-04-27 14:03:46 -04:00
889ad00e0a
set waitfor in final countdown
2018-04-27 13:02:09 -05:00
620c1fcbb8
set waitfor in final countdown (#37453 )
2018-04-27 14:01:52 -04:00
4b933b50e7
Removes some unused code.
2018-04-27 10:33:10 -05:00
b8bb30d3de
Removes some unused code. (#37449 )
2018-04-27 17:32:56 +02:00
ab3c55ab23
replaces randomized wires with departmental wires (#6376 )
2018-04-27 14:42:09 +00:00
d2fbb671ba
Removes ADS + other combat mode tweaks, makes adjuststaminabuffer() affect borg cells, adds sprinting for borgs (#6498 )
2018-04-27 14:41:31 +00:00
862898526d
Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276 )
2018-04-27 14:40:45 +00:00
681bbb1bb0
Adds follow link to admin LOOC messages (#6378 )
2018-04-27 14:39:01 +00:00
58e4152393
Fixes slime pressurization potion attempting to apply multiple times
2018-04-27 08:12:10 -05:00
ce31767862
Merge pull request #37482 from vuonojenmustaturska/bluepot
2018-04-28 01:11:30 +12:00
5f459f96e5
Adds a stationloving component to replace a couple of flags and SSinbounds with
2018-04-27 07:37:16 -05:00
d6b48869d8
Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436 )
2018-04-27 15:35:53 +03:00
403f50602f
Fixes pineapple pizza not actually tasting like pineapple
2018-04-27 07:29:39 -05:00
08f9dc0e8a
Merge pull request #37480 from ShizCalev/pineapple-meme
2018-04-28 00:28:37 +12:00
b20e89a06b
you can now print tools using the integrated circuit printer again
2018-04-27 05:17:42 -05:00
c9702d2a5c
you can now print tools using the integrated circuit printer again (#37445 )
2018-04-27 12:16:57 +02:00
4702d0232e
Merge pull request #6465 from Michiyamenotehifunana/polychromicdonators-Wave2
2018-04-27 09:47:16 +00:00
ddd9d670d3
Merge pull request #6484 from DravenPeace1/Branch-2
2018-04-27 09:45:53 +00:00
c0bc86ef21
Merge pull request #6533 from Citadel-Station-13/upstream-merge-37452
2018-04-27 09:43:11 +00:00
532ccc412c
Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373
2018-04-27 09:42:46 +00:00
580f238107
Merge pull request #6531 from Citadel-Station-13/upstream-merge-37425
2018-04-27 09:42:23 +00:00
91a6274e81
Merge pull request #6530 from Citadel-Station-13/upstream-merge-37435
2018-04-27 09:42:05 +00:00
52e35b230f
Merge pull request #6529 from Citadel-Station-13/upstream-merge-37441
2018-04-27 09:41:46 +00:00
28dd1a28ab
Merge pull request #6528 from Citadel-Station-13/upstream-merge-37439
2018-04-27 09:41:14 +00:00
eb0c82708c
Merge pull request #6527 from Citadel-Station-13/upstream-merge-37443
2018-04-27 09:40:57 +00:00
3c3e0ee339
Merge pull request #6526 from Citadel-Station-13/upstream-merge-37463
2018-04-27 09:40:35 +00:00
455216c094
Merge pull request #6525 from Citadel-Station-13/upstream-merge-37337
2018-04-27 09:40:12 +00:00
80a4f04d94
Merge pull request #6524 from Citadel-Station-13/upstream-merge-37342
2018-04-27 09:39:52 +00:00
d972ecc891
Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407
2018-04-27 09:39:29 +00:00
28904ec033
Merge pull request #6522 from Citadel-Station-13/upstream-merge-37431
2018-04-27 09:38:19 +00:00
7fd2df06a5
Merge pull request #6521 from Citadel-Station-13/upstream-merge-37405
2018-04-27 09:37:54 +00:00
85f0c174c1
Merge pull request #6520 from Citadel-Station-13/upstream-merge-37313
2018-04-27 09:37:33 +00:00
c92d4da83d
Merge pull request #6519 from Poojawa/snowflake-protection
2018-04-27 09:37:11 +00:00
deathride58