496a1d1165
[MIRROR] [s] Fixes sleeper logging. ( #7085 )
...
* Merge pull request #38429 from AnturK/runtimeA
[s] Fixes sleeper logging.
* [s] Fixes sleeper logging.
2018-06-12 17:23:37 -07:00
87cc0e6c6f
Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360
...
[MIRROR] Cleans up some logging
2018-06-12 07:41:10 -05:00
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05:00
ffd705c8d7
Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay
...
Replace area-wide fire overlay with reddening the lights
2018-06-11 22:29:10 -05:00
849c33f9bf
Adds logging for sleeper chem injections ( #38396 )
2018-06-11 00:04:21 -05:00
2a727c6df2
[MIRROR] Removes unused overview code. ( #7054 )
...
* Merge pull request #38361 from AnturK/yeahno
Removes unused overview code.
* Removes unused overview code.
2018-06-10 12:31:19 -07:00
6510066918
[MIRROR] Logs minor and major crimes ( #7053 )
...
* Merge pull request #38358 from nfreader/record_crimes
Logs minor and major crimes
* Logs minor and major crimes
2018-06-10 12:29:15 -07:00
e279392386
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
...
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
38878094bc
Merge pull request #6982 from Citadel-Station-13/upstream-merge-38264
...
[MIRROR] Fix autoprocessing cloners
2018-06-09 05:13:23 +00:00
5858b790d7
Update cloning.dm
2018-06-09 00:34:01 -04:00
16c05b0d92
adds warning to shuttle purchase menu ( #38266 )
2018-06-07 20:32:38 -05:00
717e635d28
Fixes some holocall stuff ( #38209 )
...
* Fixes some holocall stuff
* Yep
2018-06-06 14:25:23 -05:00
b49458e0ba
Merge branch 'master' into upstream-merge-38116
2018-06-05 21:30:21 +00:00
cff10c62d0
Update cloning.dm
2018-06-05 17:24:15 -04:00
2fb5bb10b5
Arcade reward: snack rigs ( #38268 )
...
* chew you havisfaction a singlelicious satisfact to snack that up?
* random snack spawn and sponsor name
* static list/initialize
2018-06-05 13:27:39 -05:00
5997b69de1
Merge pull request #6995 from Citadel-Station-13/upstream-merge-38240
...
[MIRROR] Replaces airlock_controller/incinerator related varedits with defines/subtypes
2018-06-05 12:11:34 -05:00
b94207ed11
Merge pull request #6994 from Citadel-Station-13/upstream-merge-38223
...
[MIRROR] Slight changes to camera network code
2018-06-05 12:11:19 -05:00
8157233145
Update airlock_control.dm
2018-06-03 22:19:52 -04:00
2c6c5bc5d2
Merge pull request #6998 from Citadel-Station-13/upstream-merge-38249
...
[MIRROR] Fixes comms consoles thinking the transit is on centcom
2018-06-03 16:21:19 -05:00
83cf30c92e
oh ho ( #38249 )
2018-06-03 11:45:43 -05:00
0d42b1c4d1
Replaces airlock_controller/incinerator related varedits with defines/subtypes
2018-06-03 11:03:14 -05:00
d3f34517dc
Slight changes to camera network code
2018-06-03 09:04:24 -05:00
67841c3f19
Fixes pocket items being deleted when monkeyizing ( #38220 )
2018-06-03 09:04:08 -05:00
5173ac3211
Fix autoprocessing cloners
2018-06-03 09:02:20 -05:00
93e232104d
Update embedded_controller_base.dm
2018-06-02 07:33:52 -05:00
a3febc120d
Update airlock_control.dm
2018-06-02 07:33:31 -05:00
5646dd794b
Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180
...
[MIRROR] Fix family heirloom being lost on cloning
2018-06-02 07:29:17 -05:00
5e15a988f6
Refactor machinery to default to being anchored
2018-06-01 11:28:19 -05:00
f2124aa3cf
Merge pull request #38180 from AutomaticFrenzy/patch/heirloom-clone
...
Fix family heirloom being lost on cloning
2018-06-01 09:51:08 -05:00
9c4f4ce17f
AI Multicamera mode ( #37695 )
...
* Added multicamera mode for AIs
* Minor multicamera fixes
* Cameras near an AI multicamera eye now light up red
* Disabled AI multicamera mode without admin intervention
* Fixed AIs being able to use multicamera mode when they should not
2018-05-31 22:41:48 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
761035b391
Merge pull request #6901 from Citadel-Station-13/upstream-merge-37960
...
[MIRROR] Fix some inconsistencies relating to resting
2018-05-27 14:39:18 -05:00
e544f0fe29
Update dance_machine.dm
2018-05-26 21:40:10 -05:00
ec9b4ef955
Merge pull request #6902 from Citadel-Station-13/upstream-merge-38045
...
[MIRROR] Security console fixes
2018-05-26 21:39:54 -05:00
393676aa3e
Update dance_machine.dm
2018-05-26 18:39:20 -05:00
d9b07c1f5d
Merge pull request #38045 from ShizCalev/id-teleport-fix
...
Security console fixes
2018-05-25 11:01:10 -05:00
2bcfe00283
Fix some inconsistencies relating to resting
2018-05-25 10:56:47 -05:00
52665b744a
req_one_access ( #38068 )
2018-05-25 10:48:00 -05:00
273e2aa13d
Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000
...
[MIRROR] Removes a couple thousand empty lists
2018-05-25 02:37:18 -05:00
b89254ced7
Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
...
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-24 11:58:57 -05:00
36b3cbe4bf
Removes a couple thousand empty lists ( #38000 )
...
door.shockedby
2018-05-23 21:15:41 -05:00
e4eb4939b4
Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582
...
[MIRROR] Makes more messages pronoun sensitive
2018-05-23 07:46:26 -05:00
130db93543
Merge pull request #6859 from Citadel-Station-13/upstream-merge-37982
...
[MIRROR] Fix flipping of trinary pipe fittings and related RPD tooltips
2018-05-23 06:49:44 -05:00
782c893cf4
Fix flipping of trinary pipe fittings and related RPD tooltips ( #37982 )
2018-05-23 06:33:07 -05:00
bb2f79ed7b
Fixes gulag teleporter runtime ( #37962 )
2018-05-23 01:41:24 -05:00
5f27ac30c7
Merge branch 'master' into upstream-merge-37582
2018-05-22 07:22:42 -05:00
2c73811b1f
Merge pull request #6829 from Citadel-Station-13/upstream-merge-37955
...
[MIRROR] Keep only the most recent airlock autoclose timer
2018-05-22 02:28:21 +00:00
32c63c2e70
Merge pull request #6831 from Citadel-Station-13/upstream-merge-37961
...
[MIRROR] Enable admin AI interaction for firelocks
2018-05-22 02:27:39 +00:00
3fd74027c1
Merge pull request #37945 from AutomaticFrenzy/patch/hydroponics-trays
...
Fix construction behavior of hydroponics trays
2018-05-21 16:58:31 -05:00
CitadelStationBot