 LetterJay
|
750baf3dca
|
multi level
|
2017-05-29 02:15:26 -05:00 |
|
|
LetterJay
|
aefca24012
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697
|
2017-05-29 02:12:41 -05:00 |
|
|
LetterJayandGitHub
|
e99dea2c23
|
Merge pull request #1271 from Citadel-Station-13/upstream-merge-27810
[MIRROR] [s] Fixes Centcom not being selflooping
|
2017-05-29 02:08:24 -05:00 |
|
|
LetterJayandGitHub
|
91452897a7
|
Merge pull request #1155 from Citadel-Station-13/upstream-merge-27576
[MIRROR] Fixes full controller recovery not restoring appropriate runlevel
|
2017-05-29 02:07:19 -05:00 |
|
|
LetterJayandGitHub
|
af72f4ce16
|
Merge pull request #1151 from Citadel-Station-13/upstream-merge-27528
[MIRROR] Adds the Beach Bum Language
|
2017-05-29 02:04:32 -05:00 |
|
|
LetterJay
|
5fe7f7083a
|
woo
|
2017-05-29 01:59:49 -05:00 |
|
|
LetterJay
|
1f618ab39e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27576
|
2017-05-29 01:57:56 -05:00 |
|
|
LetterJayandGitHub
|
be65d00de2
|
Merge pull request #1278 from Citadel-Station-13/GreytideStationwide
[s] Fixes all access bug
|
2017-05-29 01:33:38 -05:00 |
|
|
LetterJay
|
e0fab7fa5e
|
fixes an oopsie
|
2017-05-29 01:25:02 -05:00 |
|
|
LetterJay
|
a29e0c45ae
|
BEACHBUMBS!
|
2017-05-28 21:54:10 -05:00 |
|
|
LetterJay
|
77b4be8b3f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528
|
2017-05-28 21:49:30 -05:00 |
|
|
LetterJayandGitHub
|
745437e0eb
|
Merge pull request #1170 from Citadel-Station-13/upstream-merge-27595
[MIRROR] Improves collector feedback
|
2017-05-28 19:47:09 -05:00 |
|
|
LetterJay
|
2d41b7fe17
|
EHHH
|
2017-05-28 15:49:22 -05:00 |
|
|
LetterJay
|
42edd006b8
|
A BUNCH OF SHIT
|
2017-05-28 14:57:17 -05:00 |
|
|
LetterJay
|
7eb798931a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27595
|
2017-05-28 14:36:01 -05:00 |
|
|
LetterJayandGitHub
|
11e68fa016
|
Merge pull request #1253 from Citadel-Station-13/upstream-merge-27735
[MIRROR] Ports modular computers to initialize
|
2017-05-28 14:33:52 -05:00 |
|
|
LetterJayandGitHub
|
fcb3a53072
|
Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725
[MIRROR] Changes incorporeal movement to use defines
|
2017-05-28 14:33:22 -05:00 |
|
|
LetterJayandGitHub
|
df1ea5572c
|
Merge pull request #1254 from Citadel-Station-13/upstream-merge-27743
[MIRROR] Ports cable structures to Initialize
|
2017-05-28 14:32:31 -05:00 |
|
|
LetterJayandGitHub
|
1a28e1ccf8
|
Merge pull request #1255 from Citadel-Station-13/upstream-merge-27706
[MIRROR] Adds AI follow links to PDA messages and holopad speech
|
2017-05-28 14:32:18 -05:00 |
|
|
LetterJayandGitHub
|
c07544a553
|
Merge pull request #1258 from Citadel-Station-13/upstream-merge-27739
[MIRROR] Removes duplicate sharpener from gang uplink
|
2017-05-28 14:31:56 -05:00 |
|
|
LetterJayandGitHub
|
52606cba53
|
Merge pull request #1260 from Citadel-Station-13/upstream-merge-27750
[MIRROR] Fixes clown creampie cannon not recharging properly
|
2017-05-28 14:31:36 -05:00 |
|
|
LetterJayandGitHub
|
3197c494ae
|
Merge pull request #1250 from Citadel-Station-13/upstream-merge-27778
[MIRROR] Comm Console Fix
|
2017-05-28 14:31:13 -05:00 |
|
|
LetterJayandGitHub
|
bf48026a8f
|
Merge pull request #1268 from Citadel-Station-13/upstream-merge-27790
[MIRROR] Fixes crew monitoring console minimaps
|
2017-05-28 14:16:05 -05:00 |
|
|
LetterJayandGitHub
|
bcc2f90b84
|
Merge pull request #1245 from Citadel-Station-13/upstream-merge-27731
[MIRROR] Fixes a runtime with contraband crates
|
2017-05-28 02:59:33 -05:00 |
|
|
LetterJayandGitHub
|
a57ec48d1c
|
Merge pull request #1246 from Citadel-Station-13/upstream-merge-27730
[MIRROR] Fixes typo in garbage subsystem
|
2017-05-28 02:59:13 -05:00 |
|
|
LetterJay
|
33aae484d1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-05-27 22:49:44 -05:00 |
|
|
LetterJay
|
fdb54c3ce3
|
hat
|
2017-05-27 22:49:20 -05:00 |
|
|
LetterJayandGitHub
|
0e9f17b14a
|
Merge pull request #1181 from Citadel-Station-13/upstream-merge-27582
[MIRROR] [s] Fixes hiding the nuke disk on the arrivals shuttle
|
2017-05-26 23:25:15 -05:00 |
|
|
LetterJayandGitHub
|
ef018fb14d
|
Merge pull request #1182 from Citadel-Station-13/upstream-merge-27627
[MIRROR] Xenobio console origin tech fix
|
2017-05-26 23:24:08 -05:00 |
|
|
LetterJayandGitHub
|
a1e02fe76a
|
Merge pull request #1183 from Citadel-Station-13/upstream-merge-27626
[MIRROR] Roughly one fifth of internal affairs agents are traitors with an extra objective
|
2017-05-26 23:23:47 -05:00 |
|
|
LetterJayandGitHub
|
10db5b350d
|
Merge pull request #1185 from Citadel-Station-13/upstream-merge-27630
[MIRROR] Aux base plasma turrets now have range equal to the range they fire in
|
2017-05-26 23:23:24 -05:00 |
|
|
LetterJayandGitHub
|
bf735e5df7
|
Merge pull request #1192 from Citadel-Station-13/upstream-merge-27658
[MIRROR] Fixes adv camera leaving obscured images
|
2017-05-26 23:22:54 -05:00 |
|
|
LetterJayandGitHub
|
eea97a45c4
|
Merge pull request #1193 from Citadel-Station-13/upstream-merge-27659
[MIRROR] Moves attack chain proc from global to obj/item
|
2017-05-26 23:22:42 -05:00 |
|
|
LetterJayandGitHub
|
0137b79f6c
|
Merge pull request #1195 from Citadel-Station-13/upstream-merge-27537
[MIRROR] Adds goliath cloak & a recipe (Lavaland PvE primitive item)
|
2017-05-26 23:22:31 -05:00 |
|
|
LetterJayandGitHub
|
eadfde3cb8
|
Merge pull request #1194 from Citadel-Station-13/upstream-merge-27655
[MIRROR] Adds cycling delay to PKborg dampeners, fixes dampener projectors leaving fields behind when server is lagging
|
2017-05-26 23:22:14 -05:00 |
|
|
LetterJayandGitHub
|
e6c8385abc
|
Merge pull request #1201 from Citadel-Station-13/upstream-merge-27664
[MIRROR] Fixes typos and lies
|
2017-05-26 23:22:04 -05:00 |
|
|
LetterJayandGitHub
|
bb7a3462f0
|
Merge pull request #1199 from Citadel-Station-13/upstream-merge-27668
[MIRROR] Makes a thing use QDEL_NULL
|
2017-05-26 23:21:44 -05:00 |
|
|
LetterJayandGitHub
|
739fd7c7f4
|
Merge pull request #1202 from Citadel-Station-13/upstream-merge-27665
[MIRROR] Deletes the old java mapmerge
|
2017-05-26 23:21:19 -05:00 |
|
|
LetterJayandGitHub
|
503eb167f8
|
Merge pull request #1203 from Citadel-Station-13/upstream-merge-27670
[MIRROR] Removes Fastload.dmm
|
2017-05-26 23:21:04 -05:00 |
|
|
LetterJayandGitHub
|
1b84c67492
|
Merge pull request #1204 from Citadel-Station-13/upstream-merge-27674
[MIRROR] Replaces parentcommit with originmastercommit
|
2017-05-26 23:20:55 -05:00 |
|
|
LetterJayandGitHub
|
42959d5ae0
|
Merge pull request #1207 from Citadel-Station-13/upstream-merge-27679
[MIRROR] Ports defibs to Initialize
|
2017-05-26 23:20:38 -05:00 |
|
|
LetterJayandGitHub
|
371a902ff6
|
Merge pull request #1208 from Citadel-Station-13/upstream-merge-27680
[MIRROR] Ports stunbatons to Initialize
|
2017-05-26 23:20:28 -05:00 |
|
|
LetterJayandGitHub
|
761cafc598
|
Merge pull request #1209 from Citadel-Station-13/upstream-merge-27678
[MIRROR] Makes a thing use QDEL_NULL
|
2017-05-26 23:04:47 -05:00 |
|
|
LetterJayandGitHub
|
46ea27148a
|
Merge pull request #1210 from Citadel-Station-13/upstream-merge-27676
[MIRROR] Makes shades/constructs able to speak galcommon again
|
2017-05-26 23:04:22 -05:00 |
|
|
LetterJayandGitHub
|
32439e740a
|
Merge pull request #1213 from Citadel-Station-13/upstream-merge-27681
[MIRROR] Ports guns to Initialize
|
2017-05-26 23:03:54 -05:00 |
|
|
LetterJayandGitHub
|
ca5e56f661
|
Merge pull request #1215 from Citadel-Station-13/upstream-merge-27720
[MIRROR] Fixes pre-round-start logs
|
2017-05-26 23:03:34 -05:00 |
|
|
LetterJay
|
25059558cb
|
admin related shit
|
2017-05-26 15:26:08 -05:00 |
|
|
LetterJay
|
fabe1e98a7
|
update blackbox.dm
|
2017-05-26 12:02:26 -05:00 |
|
|
LetterJayandGitHub
|
7ad5837432
|
Merge pull request #1138 from Citadel-Station-13/upstream-merge-27545
[MIRROR] Gibtonite now uses defines
|
2017-05-25 09:43:50 -05:00 |
|
|
LetterJayandGitHub
|
8316ad7f50
|
Merge pull request #1166 from Citadel-Station-13/upstream-merge-27599
[MIRROR] Brains extracted from infectious zombies keep their old species
|
2017-05-25 09:42:13 -05:00 |
|
|
LetterJayandGitHub
|
1795b504ce
|
Merge pull request #1164 from Citadel-Station-13/upstream-merge-27578
[MIRROR] Renames a var
|
2017-05-25 09:40:06 -05:00 |
|
|
LetterJayandGitHub
|
f8c783a795
|
Merge pull request #1162 from Citadel-Station-13/upstream-merge-27586
[MIRROR] Closes bold tag in bombing list secret
|
2017-05-25 09:39:27 -05:00 |
|
|
LetterJayandGitHub
|
a90e1404dd
|
Merge pull request #1161 from Citadel-Station-13/upstream-merge-27594
[MIRROR] Fixes DBCore Recovery
|
2017-05-25 09:39:14 -05:00 |
|
|
LetterJayandGitHub
|
87c207b76b
|
Merge pull request #1160 from Citadel-Station-13/upstream-merge-27587
[MIRROR] Adds a missing null check
|
2017-05-25 09:39:06 -05:00 |
|
|
LetterJayandGitHub
|
da5b07fbd3
|
Merge pull request #1159 from Citadel-Station-13/upstream-merge-27600
[MIRROR] Fixes clock cultists not getting their "objective"
|
2017-05-25 09:38:52 -05:00 |
|
|
LetterJayandGitHub
|
78c26d8c05
|
Merge pull request #1171 from Citadel-Station-13/upstream-merge-27610
[MIRROR] Crushers now actually mark
|
2017-05-25 09:37:25 -05:00 |
|
|
LetterJayandGitHub
|
29586aef07
|
Merge pull request #1172 from Citadel-Station-13/upstream-merge-27609
[MIRROR] Fixes SSlighting Recovery
|
2017-05-25 09:37:13 -05:00 |
|
|
LetterJayandGitHub
|
374561ea8f
|
Merge pull request #1176 from Citadel-Station-13/upstream-merge-27565
[MIRROR] fixes AOE projectile automatic proximity detonation
|
2017-05-25 09:31:26 -05:00 |
|
|
LetterJayandGitHub
|
7e74cd9fde
|
Merge pull request #1177 from Citadel-Station-13/upstream-merge-27625
[MIRROR] Removes the shadowshroom admin message
|
2017-05-25 09:31:12 -05:00 |
|
|
LetterJayandGitHub
|
d0a199a643
|
Merge pull request #1178 from Citadel-Station-13/upstream-merge-27624
[MIRROR] INDESTRUCTIBLE objects are no longer affected by explosions
|
2017-05-25 09:30:27 -05:00 |
|
|
LetterJayandGitHub
|
c95a2da6bd
|
Merge pull request #1180 from Citadel-Station-13/upstream-merge-27593
[MIRROR] Gang Icons and Fixes
|
2017-05-25 09:30:09 -05:00 |
|
|
LetterJayandGitHub
|
869953cd18
|
Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503
[MIRROR] Changes investigate logs to use a define
|
2017-05-24 12:34:36 -05:00 |
|
|
LetterJayandGitHub
|
f953ec8301
|
Merge pull request #1142 from Citadel-Station-13/upstream-merge-27557
[MIRROR] Tactical Energy Gun Unique Sprites
|
2017-05-24 12:34:07 -05:00 |
|
|
LetterJay
|
9befc09252
|
UAV online
|
2017-05-24 12:21:14 -05:00 |
|
|
LetterJay
|
c8d071ccf4
|
25 kill streak with a famas
|
2017-05-24 12:20:50 -05:00 |
|
|
LetterJay
|
a9aa36e5c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557
|
2017-05-24 12:13:44 -05:00 |
|
|
LetterJayandGitHub
|
ac062c72f8
|
Merge pull request #1156 from Citadel-Station-13/upstream-merge-27574
[MIRROR] Raven Ship Blast Door Fix
|
2017-05-24 12:12:34 -05:00 |
|
|
LetterJayandGitHub
|
57f9345ace
|
Merge pull request #1135 from Citadel-Station-13/upstream-merge-27543
[MIRROR] Fixes advanced cam not cleaning up properly
|
2017-05-24 12:12:16 -05:00 |
|
|
LetterJayandGitHub
|
2edfb6f9e4
|
Merge pull request #1157 from Citadel-Station-13/upstream-merge-27580
[MIRROR] Splits equipment.dm into several component files
|
2017-05-24 10:32:11 -05:00 |
|
|
LetterJayandGitHub
|
6e53732def
|
Merge pull request #1158 from Citadel-Station-13/TacGun
Tactical Energy Gun/ERT Sec Officer Change
|
2017-05-24 10:31:30 -05:00 |
|
|
LetterJayandGitHub
|
59a73d238d
|
Merge pull request #1107 from Citadel-Station-13/upstream-merge-27495
[MIRROR] Fixes shooting out of view windows
|
2017-05-24 10:30:09 -05:00 |
|
|
LetterJay
|
936e1d3061
|
Missed during mirror downtime
|
2017-05-24 08:40:45 -05:00 |
|
|
LetterJayandGitHub
|
56c2405d35
|
Merge pull request #1143 from Citadel-Station-13/upstream-merge-27556
[MIRROR] Sketchin Alt Magazine Sprites
|
2017-05-24 08:34:19 -05:00 |
|
|
LetterJayandGitHub
|
10f5f27bf0
|
Merge pull request #1144 from Citadel-Station-13/upstream-merge-27554
[MIRROR] Prevents inserted inert legion cores from healing
|
2017-05-24 08:33:58 -05:00 |
|
|
LetterJayandGitHub
|
d995dd2dee
|
Merge pull request #1150 from Citadel-Station-13/upstream-merge-27535
[MIRROR] Ballistic Weapon/Shotgun Reload Sounds
|
2017-05-24 08:33:34 -05:00 |
|
|
LetterJayandGitHub
|
f2a1ee11a2
|
Merge pull request #1152 from Citadel-Station-13/upstream-merge-27533
[MIRROR] Auto Rifle Armour Piercing Increase
|
2017-05-24 08:33:14 -05:00 |
|
|
LetterJayandGitHub
|
e8f45a69ac
|
Merge pull request #1153 from Citadel-Station-13/upstream-merge-27570
[MIRROR] fixes comment grammar
|
2017-05-24 08:32:56 -05:00 |
|
|
LetterJayandGitHub
|
b8f22b24f7
|
Merge pull request #1154 from Citadel-Station-13/upstream-merge-27579
[MIRROR] Fixes cryo radios
|
2017-05-24 08:32:35 -05:00 |
|
|
LetterJay
|
34f82efdd7
|
mind over matter
|
2017-05-24 08:30:23 -05:00 |
|
|
LetterJay
|
fe9c47650f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27495
|
2017-05-24 08:26:40 -05:00 |
|
|
LetterJayandGitHub
|
c9fe96aac9
|
Merge pull request #1110 from Citadel-Station-13/upstream-merge-27442
[MIRROR] Cult Fixes for Construct Icons and Spells
|
2017-05-24 08:24:50 -05:00 |
|
|
LetterJay
|
e966230ed9
|
logging
|
2017-05-24 08:19:45 -05:00 |
|
|
LetterJay
|
006c74c6ae
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503
|
2017-05-24 08:11:07 -05:00 |
|
|
LetterJay
|
b2c6bd0344
|
rej cleanup
|
2017-05-24 08:08:33 -05:00 |
|
|
LetterJay
|
34e74a377e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442
|
2017-05-24 08:06:53 -05:00 |
|
|
LetterJayandGitHub
|
e34bed049f
|
Merge branch 'master' into upstream-merge-27495
|
2017-05-24 08:00:10 -05:00 |
|
|
LetterJayandGitHub
|
2db968d123
|
Merge pull request #1149 from Citadel-Station-13/upstream-merge-27572
[MIRROR] Add Glass Panes to Box Armoury Weapon Racks
|
2017-05-24 07:57:13 -05:00 |
|
|
LetterJayandGitHub
|
035e95705b
|
Merge pull request #1141 from Citadel-Station-13/upstream-merge-27558
[MIRROR] Armour Description Changes
|
2017-05-24 07:56:53 -05:00 |
|
|
LetterJayandGitHub
|
bc51506071
|
Merge pull request #1148 from Citadel-Station-13/upstream-merge-27566
[MIRROR] Fixes library machines not finding book scanners
|
2017-05-24 07:55:57 -05:00 |
|
|
LetterJayandGitHub
|
3aab463049
|
Merge pull request #1140 from Citadel-Station-13/upstream-merge-27553
[MIRROR] Fixes syndicate pod turrets
|
2017-05-24 07:55:20 -05:00 |
|
|
LetterJayandGitHub
|
da1eb3d96f
|
Merge pull request #1147 from Citadel-Station-13/upstream-merge-27546
[MIRROR] Water wets hide, you can microwave wet leather
|
2017-05-24 07:54:34 -05:00 |
|
|
LetterJayandGitHub
|
527d4bf40f
|
Merge pull request #1146 from Citadel-Station-13/upstream-merge-27549
[MIRROR] Reworks spray tan overdoses so they actually make sense
|
2017-05-24 07:52:05 -05:00 |
|
|
LetterJayandGitHub
|
ace70de8d2
|
Merge pull request #1139 from Citadel-Station-13/upstream-merge-27544
[MIRROR] Gives Void Torch its icon back
|
2017-05-24 07:51:47 -05:00 |
|
|
LetterJayandGitHub
|
e0ada1b4c6
|
Merge pull request #1137 from Citadel-Station-13/upstream-merge-27541
[MIRROR] If you're gonna make a subsystem do it right
|
2017-05-23 16:47:32 -05:00 |
|
|
LetterJayandGitHub
|
cb66fa2887
|
Merge pull request #1136 from Citadel-Station-13/upstream-merge-27542
[MIRROR] Fixes Blackbox subsystem def
|
2017-05-23 16:47:14 -05:00 |
|
|
LetterJayandGitHub
|
21b9e3a160
|
Merge pull request #1134 from Citadel-Station-13/LavalandFix
Something I broke in a previous PR that I didn't see
|
2017-05-23 10:20:20 -05:00 |
|
|
LetterJayandGitHub
|
6307b15eed
|
Merge pull request #1115 from Citadel-Station-13/upstream-merge-27527
[MIRROR] sortMerge fix
|
2017-05-23 10:13:51 -05:00 |
|
|
LetterJayandGitHub
|
23007bea3c
|
Merge pull request #1132 from Citadel-Station-13/upstream-merge-27536
[MIRROR] Gives all hats a default icon/item state so they work with chameleon gear.
|
2017-05-23 10:13:33 -05:00 |
|
|
LetterJayandGitHub
|
a0193ebfc1
|
Merge pull request #1133 from Citadel-Station-13/upstream-merge-27513
[MIRROR] [READY FOR ~REVIEW~]Makes morphs only able to change into /objs or /mobs
|
2017-05-23 10:13:16 -05:00 |
|
|
LetterJay
|
febefa0c78
|
Something I broke in a previous PR that I didn't see
|
2017-05-23 10:11:19 -05:00 |
|