 deathride58
|
ca4c2da248
|
Merge pull request #4718 from Citadel-Station-13/upstream-merge-34074
[MIRROR] Updates test areas debug command
|
2018-01-08 20:04:28 +00:00 |
|
|
CitadelStationBot
|
e5c0577284
|
Automatic changelog generation for PR #4717 [ci skip]
|
2018-01-08 14:04:11 -06:00 |
|
|
deathride58
|
b99f13f1bc
|
Merge pull request #4717 from Citadel-Station-13/upstream-merge-33768
[MIRROR] Fixes vitality matrices giving massively more vitality than they should
|
2018-01-08 20:04:08 +00:00 |
|
|
LetterJay
|
aedf5bfdca
|
Merge pull request #4660 from deathride58/mapsyncs43293845982
Complete manual sync with upstream
|
2018-01-08 13:54:57 -06:00 |
|
|
CitadelStationBot
|
52de2b84ab
|
Updates test areas debug command
|
2018-01-08 04:39:09 -06:00 |
|
|
ShizCalev
|
f54854bca8
|
Updates test areas debug command (#34074)
* Sanity check for test areas debug command
* Shifted to popup window
|
2018-01-08 04:39:09 -06:00 |
|
|
CitadelStationBot
|
5eeeae236a
|
Fixes vitality matrices giving massively more vitality than they should
|
2018-01-08 03:51:10 -06:00 |
|
|
Ashe Higgs
|
15f961958e
|
Fixes vitality matrices giving massively more vitality than they should (#33768)
* Fixes vitality matrix shenanigans
* Replaces the spawn_dust() with a variable check
* Update clock_sigils.dm
|
2018-01-08 03:51:10 -06:00 |
|
|
deathride58
|
cf57b68830
|
Merge branch 'master' into mapsyncs43293845982
|
2018-01-08 06:18:38 +00:00 |
|
|
deathride58
|
e4410a3320
|
Merge branch 'master' into mapsyncs43293845982
|
2018-01-08 06:18:11 +00:00 |
|
|
CitadelStationBot
|
2d63c57837
|
Automatic changelog generation for PR #4712 [ci skip]
|
2018-01-08 00:17:25 -06:00 |
|
|
deathride58
|
39614f685e
|
Merge pull request #4712 from Citadel-Station-13/upstream-merge-34100
[MIRROR] Adds spaceturf check to blob overmind spawning
|
2018-01-08 06:17:23 +00:00 |
|
|
deathride58
|
e39ae49a2e
|
!!experimental!! fix for flavortext readmore
|
2018-01-08 01:15:40 -05:00 |
|
|
deathride58
|
7280d91628
|
Minor boxstation changes, merges #4694 and #4697
|
2018-01-08 00:55:05 -05:00 |
|
|
CitadelStationBot
|
ec59412bca
|
Automatic changelog generation for PR #4696 [ci skip]
|
2018-01-07 22:42:30 -06:00 |
|
|
deathride58
|
c2eed848dd
|
Merge pull request #4696 from Citadel-Station-13/upstream-merge-34150
[MIRROR] Ridden vehicles now move mobs post-buckle via the buckle_mob proc instead of pre, fixing lavaboats setting people on fire
|
2018-01-08 04:42:28 +00:00 |
|
|
deathride58
|
c977193db0
|
Merge pull request #4715 from Citadel-Station-13/upstream-merge-34058
[MIRROR] Fixes component forensics deleting old instead of new component.
|
2018-01-08 04:20:43 +00:00 |
|
|
CitadelStationBot
|
e292cfce6b
|
Automatic changelog generation for PR #4714 [ci skip]
|
2018-01-07 22:19:47 -06:00 |
|
|
deathride58
|
6b27e322b8
|
Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125
[MIRROR] Makes the chaplain's soulshard require death
|
2018-01-08 04:19:45 +00:00 |
|
|
deathride58
|
9decb2e2b2
|
Update overmind.dm
|
2018-01-07 23:18:28 -05:00 |
|
|
CitadelStationBot
|
5c82730dc6
|
Automatic changelog generation for PR #4709 [ci skip]
|
2018-01-07 22:18:08 -06:00 |
|
|
deathride58
|
406df3ae92
|
Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076
[MIRROR] Fixes diagonal movement in pipes
|
2018-01-08 04:18:06 +00:00 |
|
|
deathride58
|
432fdfc0d3
|
Merge pull request #4711 from Citadel-Station-13/upstream-merge-34097
[MIRROR] Fixes can_cast short circuit
|
2018-01-08 04:17:42 +00:00 |
|
|
deathride58
|
984bf470d5
|
Merge pull request #4710 from Citadel-Station-13/upstream-merge-34093
[MIRROR] fixes some grinder recipes
|
2018-01-08 04:17:29 +00:00 |
|
|
CitadelStationBot
|
e70b9f1f1b
|
Automatic changelog generation for PR #4707 [ci skip]
|
2018-01-07 22:16:40 -06:00 |
|
|
deathride58
|
c0d2fe8817
|
Merge pull request #4707 from Citadel-Station-13/upstream-merge-33979
[MIRROR] Implements the Ballmer Peak: Now the bartender can help R&D!
|
2018-01-08 04:16:38 +00:00 |
|
|
CitadelStationBot
|
cee025e055
|
Automatic changelog generation for PR #4706 [ci skip]
|
2018-01-07 22:16:04 -06:00 |
|
|
deathride58
|
91531525ca
|
Merge pull request #4706 from Citadel-Station-13/upstream-merge-33971
[MIRROR] Newly crafted stacks are merged with held stacks of the same type
|
2018-01-08 04:16:01 +00:00 |
|
|
CitadelStationBot
|
3fd5a6d5ad
|
Automatic changelog generation for PR #4705 [ci skip]
|
2018-01-07 22:15:49 -06:00 |
|
|
deathride58
|
57d8457108
|
Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
|
2018-01-08 04:15:47 +00:00 |
|
|
deathride58
|
ba909ce9a2
|
Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128
[MIRROR] Removes the safe dial multiplier
|
2018-01-08 04:15:12 +00:00 |
|
|
CitadelStationBot
|
531a2229dd
|
Automatic changelog generation for PR #4703 [ci skip]
|
2018-01-07 22:14:54 -06:00 |
|
|
deathride58
|
d11604e502
|
Merge pull request #4703 from Citadel-Station-13/upstream-merge-34129
[MIRROR] Adds package wrapping to autolathes
|
2018-01-08 04:14:52 +00:00 |
|
|
deathride58
|
e5f3a5adde
|
Merge pull request #4702 from Citadel-Station-13/upstream-merge-34148
[MIRROR] Make tgui reload.bat work
|
2018-01-08 04:14:35 +00:00 |
|
|
deathride58
|
da3d982ed6
|
Merge pull request #4701 from Citadel-Station-13/upstream-merge-34118
[MIRROR] Reduces the memory footprint of the gas_mixture datum
|
2018-01-08 04:14:22 +00:00 |
|
|
deathride58
|
b18d720730
|
Merge pull request #4700 from Citadel-Station-13/upstream-merge-34119
[MIRROR] Fixes uplink_purchase_log GC error
|
2018-01-08 04:14:04 +00:00 |
|
|
CitadelStationBot
|
457f6de178
|
Automatic changelog generation for PR #4699 [ci skip]
|
2018-01-07 22:13:50 -06:00 |
|
|
deathride58
|
d1d2ed1139
|
Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
|
2018-01-08 04:13:47 +00:00 |
|
|
CitadelStationBot
|
ca16a7c76e
|
Automatic changelog generation for PR #4698 [ci skip]
|
2018-01-07 22:13:31 -06:00 |
|
|
deathride58
|
9f3879ce8b
|
Merge pull request #4698 from Citadel-Station-13/upstream-merge-34121
[MIRROR] Fixes decals being created on bad turfs
|
2018-01-08 04:13:28 +00:00 |
|
|
deathride58
|
94b664f934
|
Update ridden.dm
|
2018-01-07 23:10:44 -05:00 |
|
|
CitadelStationBot
|
efb304dde4
|
Automatic changelog generation for PR #4695 [ci skip]
|
2018-01-07 22:10:20 -06:00 |
|
|
deathride58
|
e43f651c89
|
Merge pull request #4695 from Citadel-Station-13/upstream-merge-34132
[MIRROR] Updates the exp config default override hours and clarifies it a bit.
|
2018-01-08 04:10:18 +00:00 |
|
|
CitadelStationBot
|
2355a5e4c3
|
Fixes component forensics deleting old instead of new component.
|
2018-01-07 21:50:23 -06:00 |
|
|
kevinz000
|
cbe0a9a05d
|
Fixes component forensics deleting old instead of new component. (#34058)
* component dupe unique
* sorry I was using webeditor on phone and it wouldn't let me tab
|
2018-01-07 21:50:23 -06:00 |
|
|
CitadelStationBot
|
fe28674e4d
|
Makes the chaplain's soulshard require death
|
2018-01-07 20:56:24 -06:00 |
|
|
Dax Dupont
|
d057f55ed4
|
Makes the chaplain's soulshard require death (#34125)
|
2018-01-07 20:56:24 -06:00 |
|
|
MoreRobustThanYou
|
02b63e199b
|
Adds spaceturf check to blob overmind spawning
|
2018-01-07 20:52:01 -06:00 |
|
|
CitadelStationBot
|
82d8c9720b
|
Fixes can_cast short circuit
|
2018-01-07 20:49:50 -06:00 |
|
|
Jordan Brown
|
af27a1aa03
|
Fixes can_cast short circuit (#34097)
|
2018-01-07 20:49:50 -06:00 |
|