LetterJay
|
88b452595f
|
Update antag_spawner.dm
|
2017-09-02 06:52:03 -05:00 |
|
CitadelStationBot
|
196c9d0597
|
Adds tracking amount of time spent playing departments 2: The fall of the Assistants.
|
2017-08-20 06:01:24 -05:00 |
|
LetterJay
|
95cbe66a3a
|
Merge pull request #2362 from Citadel-Station-13/upstream-merge-29870
[MIRROR] Fixes a typo in the blobbernaut spawn text
|
2017-08-18 13:41:37 -05:00 |
|
LetterJay
|
6dd7c44bbc
|
Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829
[MIRROR] Merges the two turf/Entereds
|
2017-08-18 13:41:23 -05:00 |
|
LetterJay
|
19b8a5a380
|
Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858
[MIRROR] Fixed sign description
|
2017-08-18 13:41:07 -05:00 |
|
LetterJay
|
8a7c0e657f
|
Update powers.dm
|
2017-08-18 11:20:36 -05:00 |
|
LetterJay
|
db3622ca12
|
Update signs.dm
|
2017-08-18 11:18:33 -05:00 |
|
LetterJay
|
3c91fba8e3
|
Update turf.dm
|
2017-08-18 11:16:30 -05:00 |
|
LetterJay
|
146b5880d5
|
Merge pull request #2410 from Citadel-Station-13/upstream-merge-29934
[MIRROR] Fixes leathercrafting recipies trying to build on the floor.
|
2017-08-17 10:09:16 -05:00 |
|
LetterJay
|
c32595f980
|
Merge pull request #2399 from Citadel-Station-13/upstream-merge-29820
[MIRROR] Blobs can now sense loving cuddles!
|
2017-08-17 10:07:37 -05:00 |
|
LetterJay
|
e44a70c135
|
Merge pull request #2396 from Citadel-Station-13/upstream-merge-29797
[MIRROR] Moves most of world.dm
|
2017-08-17 10:07:06 -05:00 |
|
CitadelStationBot
|
72cf7083f6
|
Fixes leathercrafting recipies trying to build on the floor.
|
2017-08-17 09:19:09 -05:00 |
|
CitadelStationBot
|
68830dac71
|
Changes smes, cells, cell charger, terminals and apcs icons
|
2017-08-16 20:02:24 -05:00 |
|
CitadelStationBot
|
4bd5e318c2
|
Blobs can now sense loving cuddles!
|
2017-08-16 18:00:54 -05:00 |
|
CitadelStationBot
|
afbe4be50c
|
Moves most of world.dm
|
2017-08-16 17:51:33 -05:00 |
|
CitadelStationBot
|
c2d335b7da
|
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
|
2017-08-16 17:50:28 -05:00 |
|
LetterJay
|
0ffaf66d1f
|
Merge branch 'master' into upstream-merge-29690
|
2017-08-15 19:18:22 -05:00 |
|
LetterJay
|
865c56afbf
|
Update areas.dm
|
2017-08-15 19:08:05 -05:00 |
|
LetterJay
|
24be45e6fa
|
Update sound.dm
|
2017-08-15 18:56:57 -05:00 |
|
LetterJay
|
ab27b63cf9
|
Merge branch 'master' into upstream-merge-29611
|
2017-08-15 18:55:12 -05:00 |
|
LetterJay
|
41c9cf3a4a
|
Update machinery.dm
|
2017-08-15 18:53:10 -05:00 |
|
CitadelStationBot
|
3d83b55cf6
|
Annihilates the colons!
|
2017-08-15 10:49:55 -05:00 |
|
LetterJay
|
62eee8804e
|
Merge pull request #2337 from Citadel-Station-13/upstream-merge-29815
[MIRROR] Fixes bad dirs
|
2017-08-14 22:18:07 -05:00 |
|
LetterJay
|
31b501aa1a
|
Merge branch 'master' into upstream-merge-29885
|
2017-08-14 19:41:45 -05:00 |
|
LetterJay
|
64b3fe43d9
|
Update shieldgen.dm
|
2017-08-14 19:38:43 -05:00 |
|
LetterJay
|
b962876d38
|
Merge pull request #2371 from Citadel-Station-13/upstream-merge-29868
[MIRROR] Fixes the Resurrect Cultist rune not working
|
2017-08-14 18:53:53 -05:00 |
|
LetterJay
|
e5cd79a14e
|
Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
[MIRROR] Moved can_trigger_gun to item/weapon parent
|
2017-08-14 18:53:38 -05:00 |
|
LetterJay
|
2719f23e52
|
Update shieldgen.dm
|
2017-08-14 18:53:01 -05:00 |
|
LetterJay
|
98ff124b68
|
Update shieldgen.dm
|
2017-08-14 18:50:44 -05:00 |
|
LetterJay
|
6d62d51eab
|
Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288
[MIRROR] Hallucinations 3.0
|
2017-08-14 18:45:45 -05:00 |
|
LetterJay
|
300fc768a5
|
Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
|
2017-08-14 18:37:28 -05:00 |
|
LetterJay
|
1bb5e19596
|
Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695
[MIRROR] flora.dm initialize hint
|
2017-08-14 18:36:58 -05:00 |
|
LetterJay
|
69bf7e42cf
|
Merge branch 'master' into upstream-merge-29288
|
2017-08-14 18:35:28 -05:00 |
|
CitadelStationBot
|
97243fca3a
|
Moved can_trigger_gun to item/weapon parent
|
2017-08-14 16:05:43 -05:00 |
|
CitadelStationBot
|
5fd3a8355c
|
Fixes the Resurrect Cultist rune not working
|
2017-08-14 16:05:33 -05:00 |
|
LetterJay
|
f088e812a9
|
Update flora.dm
|
2017-08-14 09:31:49 -05:00 |
|
LetterJay
|
123454c45a
|
Merge pull request #2366 from Citadel-Station-13/upstream-merge-29846
[MIRROR] Makes mulligan antag check for gamemode required players
|
2017-08-14 08:21:24 -05:00 |
|
CitadelStationBot
|
e986657b16
|
Makes mulligan antag check for gamemode required players
|
2017-08-14 06:25:03 -05:00 |
|
CitadelStationBot
|
7fe8dd208d
|
[s] Clean up some inputs
|
2017-08-14 02:44:24 -05:00 |
|
CitadelStationBot
|
7aa960b499
|
Fixes a typo in the blobbernaut spawn text
|
2017-08-14 01:23:57 -05:00 |
|
CitadelStationBot
|
16428315aa
|
Merges the two turf/Entereds
|
2017-08-13 18:01:40 -05:00 |
|
CitadelStationBot
|
e354c9f289
|
Fixes turf slipping
|
2017-08-13 18:00:36 -05:00 |
|
CitadelStationBot
|
bd35823012
|
[ready]Makes bIcon better
|
2017-08-13 17:41:12 -05:00 |
|
LetterJay
|
64da23febb
|
Merge pull request #2356 from Citadel-Station-13/upstream-merge-29840
[MIRROR] Adds icon_states to the unused and used Eldritch whetstones
|
2017-08-13 09:53:11 -05:00 |
|
CitadelStationBot
|
1e3ea07d8b
|
Adds icon_states to the unused and used Eldritch whetstones
|
2017-08-13 01:28:24 -05:00 |
|
CitadelStationBot
|
7004797c8c
|
Fixed sign description
|
2017-08-13 01:28:08 -05:00 |
|
CitadelStationBot
|
80f1fb8c58
|
Fix fireaxe cabinets spawned with broken icons
|
2017-08-13 01:28:03 -05:00 |
|
LetterJay
|
a9a7807473
|
Merge pull request #2339 from Citadel-Station-13/upstream-merge-29819
[MIRROR] His Grace now shows up on the orbit list
|
2017-08-12 06:36:57 -05:00 |
|
LetterJay
|
dd6c9d6a04
|
Merge pull request #2334 from Citadel-Station-13/upstream-merge-29811
[MIRROR] Fixes cable cuff inhand
|
2017-08-12 06:36:15 -05:00 |
|
LetterJay
|
122727059b
|
Merge pull request #2333 from Citadel-Station-13/upstream-merge-29804
[MIRROR] Ports weaponry to Initialize
|
2017-08-12 06:35:25 -05:00 |
|