71d0804bce
Update circuitprinter.dm
2017-12-05 18:26:41 -05:00
838011614e
Update rdmachines.dm
2017-12-05 17:47:38 -05:00
db8ef8969d
Update protolathe.dm
2017-12-05 17:47:12 -05:00
15fd10790c
Update circuitprinter.dm
2017-12-05 17:46:31 -05:00
9c0eae753d
Update circuitprinter.dm
2017-12-05 17:44:45 -05:00
3bff5f4cd6
Update PDA_types.dm
2017-12-05 17:43:52 -05:00
cf23ed4e14
Update mech_fabricator.dm
2017-12-05 17:42:56 -05:00
e1f658a50d
Removes ComponentActivated in favor of callbacks
2017-12-05 15:42:47 -06:00
a6aa181161
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
...
[MIRROR] Moves some machine sprites into /machines/ folder
2017-12-05 20:37:30 +00:00
24d205f9c9
Merge pull request #4223 from Citadel-Station-13/upstream-merge-33243
...
[MIRROR] Adds a CRASH on invalid calls to record_feedback
2017-12-05 20:22:38 +00:00
2ac8f3f484
Merge pull request #4222 from Citadel-Station-13/upstream-merge-33242
...
[MIRROR] Emphasises the importance of round ID in issue template
2017-12-05 20:22:23 +00:00
d38fcd8a65
Merge pull request #4221 from Citadel-Station-13/upstream-merge-33247
...
[MIRROR] Excludes ___TGS3TempBranch from builds
2017-12-05 20:22:00 +00:00
1ecf6e57d8
Automatic changelog generation for PR #4220 [ci skip]
2017-12-05 14:21:35 -06:00
6171f2160b
Merge pull request #4220 from Citadel-Station-13/upstream-merge-33251
...
[MIRROR] Reduces the volume of showers
2017-12-05 20:21:32 +00:00
a8d0718e0f
Merge pull request #4219 from Citadel-Station-13/upstream-merge-33244
...
[MIRROR] Adds server tools version to feedback
2017-12-05 20:21:18 +00:00
9cf421a17f
Automatic changelog generation for PR #4216 [ci skip]
2017-12-05 14:18:45 -06:00
d472cc4ba9
Merge pull request #4216 from Citadel-Station-13/upstream-merge-33234
...
[MIRROR] Stethoscopes now inform the user if the target can be defibrillated
2017-12-05 20:18:43 +00:00
4aac4096a8
Automatic changelog generation for PR #4215 [ci skip]
2017-12-05 14:18:25 -06:00
44d54c66f1
Merge pull request #4215 from Citadel-Station-13/upstream-merge-33230
...
[MIRROR] Adds disco inferno shuttle.
2017-12-05 20:18:21 +00:00
3526d4045a
Merge pull request #4214 from Citadel-Station-13/upstream-merge-33288
...
[MIRROR] Fixes powernets
2017-12-05 20:17:33 +00:00
14ceab7ce2
Deletes cyrogenic2.dmi so the pr matches with upstream's
2017-12-05 15:16:04 -05:00
fec2c32ec7
Merge pull request #4224 from Citadel-Station-13/upstream-merge-33237
...
[MIRROR] Fixes robeless apprentice
2017-12-05 20:13:38 +00:00
6430d68d92
Merge pull request #4217 from Citadel-Station-13/upstream-merge-33240
...
[MIRROR] [Metastation] Easel in Quiet Room moved to art storage
2017-12-05 20:13:21 +00:00
e0589e63a3
Automatic changelog generation for PR #4218 [ci skip]
2017-12-05 14:12:28 -06:00
565852d835
Merge pull request #4218 from Citadel-Station-13/upstream-merge-32964
...
[MIRROR] Measure energy values in joules
2017-12-05 20:12:25 +00:00
69f730493d
Merge pull request #4226 from Citadel-Station-13/upstream-merge-33277
...
[MIRROR] Fixes departmental say
2017-12-05 20:12:01 +00:00
ea8a6df745
Merge pull request #4228 from Citadel-Station-13/upstream-merge-33305
...
[MIRROR] [s] Fix changeling chat
2017-12-05 20:11:43 +00:00
b3dc971e55
[s] Fix changeling chat
2017-12-05 13:43:03 -06:00
d5cf1b3fec
[s] Fix changeling chat ( #33305 )
...
* Fix changeling chat
* Update say.dm
2017-12-05 13:43:03 -06:00
828df6f12a
rreeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
2017-12-05 07:14:48 -06:00
13c890144b
Fixes departmental say
2017-12-05 04:08:13 -06:00
4b2a1c9d77
Merge pull request #33277 from tgstation/Cyberboss-patch-8
...
Fixes departmental say
2017-12-05 04:08:13 -06:00
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
daad40e399
Fixes robeless apprentice
2017-12-05 03:23:54 -06:00
47ffd28850
Fixes robeless apprentice
2017-12-05 03:23:54 -06:00
b7134d6355
Adds a CRASH on invalid calls to record_feedback
2017-12-05 03:23:46 -06:00
0f76084794
Merge pull request #33243 from tgstation/Cyberboss-patch-5
...
Adds a CRASH on invalid calls to record_feedback
2017-12-05 03:23:46 -06:00
adae2c5956
Emphasises the importance of round ID in issue template
2017-12-05 03:23:38 -06:00
dda9a4f57c
Emphasises the importance of round ID in issue template
2017-12-05 03:23:38 -06:00
9d16124533
Excludes ___TGS3TempBranch from builds
2017-12-05 03:23:30 -06:00
cdc49eb28a
Merge pull request #33247 from tgstation/Cyberboss-patch-2
...
Excludes ___TGS3TempBranch from builds
2017-12-05 03:23:30 -06:00
57ef068e42
Reduces the volume of showers
2017-12-05 03:23:22 -06:00
d6f9871bd3
Merge pull request #33251 from tgstation/Cyberboss-patch-3
...
Reduces the volume of showers
2017-12-05 03:23:22 -06:00
7d4845e096
Adds server tools version to feedback
2017-12-05 03:23:15 -06:00
5c1ccad969
Adds server tools version to feedback ( #33244 )
...
* Adds server tools version to feedback
* Fix incorrect call to record_feedback
* Add number to record feedback calls
2017-12-05 03:23:15 -06:00
466dc3055f
Measure energy values in joules
2017-12-05 03:23:06 -06:00
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
92f4110a3d
[Metastation] Easel in Quiet Room moved to art storage
2017-12-05 03:22:56 -06:00
e7fd239238
[Metastation] Easel in Quiet Room moved to art storage ( #33240 )
...
That easel awkwardly blocks access to the table in the corner, so I've
moved it to art storage, removing a photocopier from art storage to
allow it to fit.
2017-12-05 03:22:56 -06:00
b21893db81
Stethoscopes now inform the user if the target can be defibrillated
2017-12-05 03:22:48 -06:00
deathride58