kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
CitadelStationBot
|
92ead7e65d
|
Automatic changelog generation for PR #9601 [ci skip]
|
2020-01-19 17:10:59 -06:00 |
|
kevinz000
|
088e586b47
|
Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2020-01-19 16:10:56 -07:00 |
|
Ghom
|
cf9c3a65fd
|
Merge pull request #10587 from Arturlang/Bloodsucker_antag_bans
Adds bloodsucker antagonist bans
|
2020-01-19 16:38:45 +01:00 |
|
CitadelStationBot
|
ecaff2ffe8
|
Automatic changelog generation for PR #10520 [ci skip]
|
2020-01-19 09:37:42 -06:00 |
|
Ghom
|
536900a7ac
|
Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
|
2020-01-19 16:37:40 +01:00 |
|
CitadelStationBot
|
95cddfed27
|
Automatic changelog generation for PR #10307 [ci skip]
|
2020-01-19 09:35:50 -06:00 |
|
Ghom
|
812182230f
|
Merge pull request #10307 from Seris02/stunglasses
stunglasses
|
2020-01-19 16:35:47 +01:00 |
|
Ghom
|
4a0c85e0c0
|
Merge pull request #10594 from chefferz/chefferz-abductor1
Removes shrink rays from abductor console.
|
2020-01-19 16:12:51 +01:00 |
|
CitadelStationBot
|
cd47e81b18
|
Automatic changelog generation for PR #10547 [ci skip]
|
2020-01-19 08:33:33 -06:00 |
|
Ghom
|
637e26eec9
|
Merge pull request #10547 from Putnam3145/one-more-dojo-tweak
Makes ghost dojo mobs dust if they're dead and ghostless
|
2020-01-19 15:33:30 +01:00 |
|
Putnam
|
cc1fcee4ac
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak
|
2020-01-19 03:56:41 -08:00 |
|
Seris02
|
25d7af31a5
|
merge fixes
|
2020-01-19 16:36:04 +08:00 |
|
Hatterhat
|
590d71ddc1
|
hey ghom i fixed it i think
|
2020-01-18 23:35:52 -06:00 |
|
Ghom
|
0a5e2cf8ff
|
Merge pull request #10601 from Putnam3145/dojo-hilbert
Adds 16777216 dorms to the ghost dojo
|
2020-01-19 03:02:32 +01:00 |
|
Ghommie
|
072eca6ec0
|
fixes and more PRs
|
2020-01-18 23:01:00 +01:00 |
|
Ghommie
|
3ee855ab77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 22:14:06 +01:00 |
|
CitadelStationBot
|
4d06c2d2d3
|
Automatic changelog generation for PR #10568 [ci skip]
|
2020-01-18 15:13:26 -06:00 |
|
Ghom
|
2147a2024f
|
Merge pull request #10568 from r4d6/Passive-Vents
Add passive vents
|
2020-01-18 22:13:23 +01:00 |
|
r4d6
|
4e6ad84317
|
Fix conflict
|
2020-01-18 16:05:56 -05:00 |
|
r4d6
|
810556cbb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
|
2020-01-18 16:03:49 -05:00 |
|
CitadelStationBot
|
bb6101f9a3
|
Automatic changelog generation for PR #10571 [ci skip]
|
2020-01-18 14:46:19 -06:00 |
|
Lin
|
760bbfa8b6
|
Merge pull request #10571 from Ghommie/Ghommie-cit507
Riot foam dart design cost consistency.
|
2020-01-18 20:46:16 +00:00 |
|
CitadelStationBot
|
0cc3795f15
|
Automatic changelog generation for PR #10578 [ci skip]
|
2020-01-18 13:32:17 -06:00 |
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
CitadelStationBot
|
0bc10319d9
|
Automatic changelog generation for PR #10501 [ci skip]
|
2020-01-18 13:16:32 -06:00 |
|
Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
CitadelStationBot
|
e9f626dd59
|
Automatic changelog generation for PR #10600 [ci skip]
|
2020-01-18 11:52:17 -06:00 |
|
Ghom
|
9f2bc48d74
|
Merge pull request #10600 from Kraseo/ricetriangles
Fixes sprinkles on jelly donuts + lack of berry juice
|
2020-01-18 18:52:14 +01:00 |
|
CitadelStationBot
|
f1ea68c977
|
Automatic changelog generation for PR #10580 [ci skip]
|
2020-01-18 10:47:34 -06:00 |
|
Ghom
|
07b3bac674
|
Merge pull request #10580 from Putnam3145/craft-log
Craft logging
|
2020-01-18 17:47:31 +01:00 |
|
CitadelStationBot
|
bbe5b0e281
|
Automatic changelog generation for PR #10586 [ci skip]
|
2020-01-18 10:42:32 -06:00 |
|
Ghom
|
c00be1a9b1
|
Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
|
2020-01-18 17:42:30 +01:00 |
|
Ghom
|
29c3e72335
|
You jelly.
|
2020-01-18 17:41:31 +01:00 |
|
CitadelStationBot
|
c7907e9173
|
Automatic changelog generation for PR #10481 [ci skip]
|
2020-01-18 09:56:34 -06:00 |
|
Ghom
|
0a1277c28f
|
Merge pull request #10481 from dapnee/BEEES
Updates Science Uniform and Accessories
|
2020-01-18 16:56:31 +01:00 |
|
CitadelStationBot
|
ea3d6a1977
|
Automatic changelog generation for PR #10599 [ci skip]
|
2020-01-18 09:54:55 -06:00 |
|
Ghom
|
5a613809f5
|
Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 16:54:52 +01:00 |
|
Putnam
|
133cb89b32
|
hilbert's hotel for ghost dojo
|
2020-01-18 06:55:26 -08:00 |
|
Kraseo
|
6708607073
|
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
|
2020-01-18 15:05:07 +01:00 |
|
Putnam
|
b30948a60a
|
Fixed gibtonite instantly exploding on pick mining
|
2020-01-18 04:37:44 -08:00 |
|
Dap
|
c13a5687d6
|
HOW MANY TIMES DO I GOTTA SCREAM AT YOU TO MERGE THIS OLD MAN
|
2020-01-18 02:53:03 -07:00 |
|
Dap
|
28c9700308
|
Merge remote-tracking branch 'upstream/master' into BEEES
|
2020-01-18 02:27:15 -07:00 |
|
Putnam
|
6d4f400f5c
|
updated the tgui file for the conflict
|
2020-01-17 21:34:41 -08:00 |
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
chefferz
|
54a2b32f42
|
Update console.dm
|
2020-01-17 23:55:44 -05:00 |
|
r4d6
|
0d3706b7f9
|
Make public shuttle not require access
|
2020-01-17 22:15:29 -05:00 |
|
r4d6
|
4e114d399c
|
Readding Cryo Sleeper in the gulag
|
2020-01-17 22:13:19 -05:00 |
|
kevinz000
|
fd440ac379
|
Merge pull request #10592 from Ghommie/Ghommie-cit508
Kevinz let some files fall back to CRLF.
|
2020-01-17 17:34:13 -07:00 |
|
CitadelStationBot
|
61804e4147
|
Automatic changelog generation for PR #10579 [ci skip]
|
2020-01-17 18:32:32 -06:00 |
|