oranges
|
c56bb27bbd
|
Merge pull request #31167 from tgstation/Cyberboss-patch-2
Prompt for observer confirmation now happens when you click it initially
|
2017-10-01 14:43:52 -05:00 |
|
LetterJay
|
fafd98ed0e
|
Merge pull request #3033 from Citadel-Station-13/upstream-merge-31142
[MIRROR] Fixes cogscarab sprites not updating
|
2017-10-01 15:42:35 -04:00 |
|
LetterJay
|
40f541b9da
|
Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
[MIRROR] Fixes liches losing spells
|
2017-10-01 15:42:12 -04:00 |
|
LetterJay
|
5ec781502c
|
Merge branch 'master' into upstream-merge-31116
|
2017-10-01 15:09:10 -04:00 |
|
LetterJay
|
4e80c2574a
|
Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069
[MIRROR] Cleanup to various loc assignments and nearby code
|
2017-10-01 15:08:21 -04:00 |
|
LetterJay
|
eb24540ba3
|
Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108
[MIRROR] Corrected shuttle refuel time
|
2017-10-01 15:07:43 -04:00 |
|
LetterJay
|
490885a36f
|
update
|
2017-10-01 13:02:52 -05:00 |
|
LetterJay
|
9f05ef16df
|
Merge branch 'master' into upstream-merge-31108
|
2017-10-01 04:31:36 -04:00 |
|
LetterJay
|
926db45b54
|
Update world.dm
|
2017-10-01 03:06:11 -05:00 |
|
LetterJay
|
80a84db919
|
Update adminhelp.dm
|
2017-10-01 02:39:24 -05:00 |
|
LetterJay
|
ef10ac589a
|
Update getrev.dm
|
2017-10-01 02:39:07 -05:00 |
|
LetterJay
|
0ab234ceb0
|
Merge branch 'master' into upstream-merge-31000
|
2017-10-01 03:31:49 -04:00 |
|
LetterJay
|
22b148f078
|
Merge pull request #3014 from Citadel-Station-13/upstream-merge-31140
[MIRROR] Fixes AI law weights infinite loop
|
2017-10-01 03:26:42 -04:00 |
|
LetterJay
|
49c63dd794
|
Update randomverbs.dm
|
2017-10-01 01:57:03 -05:00 |
|
LetterJay
|
f621fb704b
|
Merge branch 'master' into upstream-merge-31069
|
2017-10-01 02:56:28 -04:00 |
|
LetterJay
|
4be6f22669
|
Merge branch 'master' into upstream-merge-31108
|
2017-10-01 02:53:27 -04:00 |
|
LetterJay
|
92c3a48507
|
Merge branch 'master' into upstream-merge-31140
|
2017-10-01 02:53:18 -04:00 |
|
LetterJay
|
6a8ca2e02c
|
Merge branch 'master' into upstream-merge-31037
|
2017-10-01 02:53:03 -04:00 |
|
LetterJay
|
b15f639621
|
Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
|
2017-10-01 02:51:56 -04:00 |
|
LetterJay
|
ef96be641a
|
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
[MIRROR] Adds Nars-Ian and clock hawks
|
2017-10-01 02:50:31 -04:00 |
|
LetterJay
|
81e40cc5c8
|
Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
[MIRROR] Configuration datum refactor
|
2017-10-01 02:50:17 -04:00 |
|
LetterJay
|
8be007225b
|
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
[MIRROR] Fixes shade attackby
|
2017-10-01 02:20:35 -04:00 |
|
LetterJay
|
1d1a862e1b
|
Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045
[MIRROR] Reebe is fancier now
|
2017-10-01 02:20:23 -04:00 |
|
LetterJay
|
747312cb6d
|
updates
|
2017-10-01 00:59:59 -05:00 |
|
LetterJay
|
0cc54029e2
|
Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096
[MIRROR] Cleans up some unused code
|
2017-10-01 01:19:36 -04:00 |
|
LetterJay
|
33b481dffb
|
Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073
[MIRROR] Log attempted injections as well as successful ones
|
2017-10-01 01:19:20 -04:00 |
|
LetterJay
|
f55c86edfb
|
Merge branch 'master' into upstream-merge-31045
|
2017-10-01 01:17:52 -04:00 |
|
LetterJay
|
11b558c367
|
Merge branch 'master' into upstream-merge-31093
|
2017-10-01 00:50:26 -04:00 |
|
LetterJay
|
d6ec5791a6
|
Update dna.dm
|
2017-09-30 22:35:57 -05:00 |
|
MoreRobustThanYou
|
e63e05255f
|
Fixes cogscarab sprites not updating (#31142)
* Fixes cogscarab sprites now updating
* fix spacing
* Update extra_drone_types.dm
|
2017-09-30 21:30:48 -05:00 |
|
AnturK
|
6411e25110
|
Fixes liches losing spells
|
2017-09-30 14:54:02 -05:00 |
|
AnturK
|
6afd603fe6
|
Fixes some hardset dna misuse
|
2017-09-30 14:51:52 -05:00 |
|
CitadelStationBot
|
aaa2a214cb
|
[MIRROR] Fixes material container flags precedence (#3029)
* Fixes material container flags precedence
* Update material_container.dm
|
2017-09-30 12:39:57 -07:00 |
|
LetterJay
|
04d071deda
|
Merge branch 'master' into upstream-merge-30763
|
2017-09-30 15:30:46 -04:00 |
|
LetterJay
|
9e48311632
|
Update cloning.dm
|
2017-09-30 14:27:04 -05:00 |
|
LetterJay
|
07c95ef168
|
Update aifixer.dm
|
2017-09-30 14:26:41 -05:00 |
|
LetterJay
|
cc9e462988
|
Update camera_assembly.dm
|
2017-09-30 14:26:22 -05:00 |
|
LetterJay
|
410ca14e17
|
Update h_sandbox.dm
|
2017-09-30 14:25:58 -05:00 |
|
LetterJay
|
7193e9da83
|
Update wires.dm
|
2017-09-30 14:25:29 -05:00 |
|
LetterJay
|
cae6983aea
|
Update wizarditis.dm
|
2017-09-30 14:25:05 -05:00 |
|
LetterJay
|
99319f5d4d
|
Update shuttle.dm
|
2017-09-30 14:23:40 -05:00 |
|
LetterJay
|
dddf85a7df
|
Update bags.dm
|
2017-09-30 14:23:03 -05:00 |
|
LetterJay
|
fdb101596d
|
Update bodybag.dm
|
2017-09-30 14:22:39 -05:00 |
|
LetterJay
|
6c4934a34a
|
Update ai_laws.dm
|
2017-09-30 14:22:12 -05:00 |
|
LetterJay
|
6ec50aeae2
|
Update observer.dm
|
2017-09-30 14:20:50 -05:00 |
|
LetterJay
|
9f01bf378d
|
Update hypospray.dm
|
2017-09-30 14:20:25 -05:00 |
|
LetterJay
|
4fd4d77eb1
|
Update shade.dm
|
2017-09-30 14:20:01 -05:00 |
|
LetterJay
|
6d59f3b06f
|
Update misc_walls.dm
|
2017-09-30 14:19:40 -05:00 |
|
LetterJay
|
b88081e106
|
Update misc_floor.dm
|
2017-09-30 14:19:27 -05:00 |
|
LetterJay
|
a6a4deb94c
|
Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084
[MIRROR] Fixes transitions
|
2017-09-30 15:18:26 -04:00 |
|