 Ghom
|
f5dbb0b20d
|
Merge pull request #11187 from Trilbyspaceclone/sweet
New bar sign, The Hive
|
2020-02-23 22:47:37 +01:00 |
|
|
Ghom
|
3e232f93d9
|
Update barsigns.dm
|
2020-02-23 22:47:21 +01:00 |
|
|
Ghom
|
112c203216
|
Merge pull request #11213 from Hatterhat/combifans
combifan fix please speedmerge
|
2020-02-23 21:35:15 +01:00 |
|
|
Hatterhat
|
31a93d9f32
|
you'd think i'd have remembered to change paths
|
2020-02-23 14:27:40 -06:00 |
|
|
kevinz000
|
ae42db8674
|
Merge pull request #11210 from Ghommie/Ghommie-cit588
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 06:02:13 -07:00 |
|
|
Ghom
|
485241a361
|
cleanup detail
|
2020-02-23 13:32:46 +01:00 |
|
|
CitadelStationBot
|
9085c9865b
|
Automatic changelog generation for PR #11206 [ci skip]
|
2020-02-23 06:30:25 -06:00 |
|
|
Ghom
|
2075147ee9
|
Merge pull request #11206 from Trilbyspaceclone/patch-294
Corn dogs now have a sprite
|
2020-02-23 13:30:23 +01:00 |
|
|
Ghommie
|
0d67e81ad5
|
Yo.
|
2020-02-23 13:18:16 +01:00 |
|
|
Ghommie
|
2b740f9bad
|
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 13:09:21 +01:00 |
|
|
CitadelStationBot
|
fd5051361e
|
Automatic changelog generation for PR #11207 [ci skip]
|
2020-02-23 05:37:20 -06:00 |
|
|
Ghom
|
b4bca3663c
|
Merge pull request #11207 from Trilbyspaceclone/patch-295
[s] Fixes sand crafting
|
2020-02-23 12:37:17 +01:00 |
|
|
TrilbySpaceClone
|
845e719ade
|
But what if we did it right?
|
2020-02-23 01:52:36 -05:00 |
|
|
Trilbyspaceclone
|
2dea3cf15c
|
Gives ash sandstone
|
2020-02-23 00:53:42 -05:00 |
|
|
Trilbyspaceclone
|
342f1cd4c1
|
Update snacks_meat.dm
|
2020-02-22 23:17:30 -05:00 |
|
|
CitadelStationBot
|
214cd92fef
|
Automatic changelog generation for PR #11179 [ci skip]
|
2020-02-22 15:49:11 -06:00 |
|
|
Ghom
|
0c558f53d9
|
Merge pull request #11179 from Trilbyspaceclone/patch-290
AIs now understand dwarf
|
2020-02-22 22:49:08 +01:00 |
|
|
CitadelStationBot
|
9e37f30aed
|
Automatic changelog generation for PR #11182 [ci skip]
|
2020-02-22 15:30:36 -06:00 |
|
|
Ghom
|
211be93718
|
Merge pull request #11182 from Trilbyspaceclone/doner_begone!
Removes doner items as well as armored hats from holodeck lockers
|
2020-02-22 22:30:34 +01:00 |
|
|
CitadelStationBot
|
8dbf2b9a7d
|
Automatic changelog generation for PR #11191 [ci skip]
|
2020-02-22 15:24:22 -06:00 |
|
|
Ghom
|
520f5eab83
|
Merge pull request #11191 from YakumoChen/beelord
Beegions
|
2020-02-22 22:24:20 +01:00 |
|
|
CitadelStationBot
|
e1ec2497b1
|
Automatic changelog generation for PR #11172 [ci skip]
|
2020-02-22 08:53:30 -06:00 |
|
|
Ghom
|
6f181365c2
|
Merge pull request #11172 from Trilbyspaceclone/bows!
Bow corrections.
|
2020-02-22 15:53:27 +01:00 |
|
|
CitadelStationBot
|
2e5a829e6c
|
Automatic changelog generation for PR #11186 [ci skip]
|
2020-02-22 08:10:01 -06:00 |
|
|
Ghom
|
b7fab93209
|
Merge pull request #11186 from Putnam3145/fixed-flavor
Fixed temp flavor text (for real)
|
2020-02-22 15:09:58 +01:00 |
|
|
Putnam
|
d328d554ba
|
Reduced copypasta
|
2020-02-22 02:38:57 -08:00 |
|
|
CitadelStationBot
|
d4e1c30597
|
Automatic changelog generation for PR #10848 [ci skip]
|
2020-02-22 00:28:47 -06:00 |
|
|
kevinz000
|
856af1f182
|
Merge pull request #10848 from Ghommie/Ghommie-cit229
Porting Floyd Materials: Trying again edition
|
2020-02-21 23:28:44 -07:00 |
|
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
YakumoChen
|
418374be06
|
beegion
|
2020-02-21 17:56:14 +00:00 |
|
|
CitadelStationBot
|
869fb5e897
|
Automatic changelog generation for PR #11175 [ci skip]
|
2020-02-21 09:46:22 -06:00 |
|
|
Ghom
|
42416483e7
|
Merge pull request #11175 from keronshb/NaniteFixes
Fixes healing nanites
|
2020-02-21 16:46:19 +01:00 |
|
|
YakumoChen
|
2f2ddbad5a
|
removes density from skulls
|
2020-02-21 12:07:58 +00:00 |
|
|
YakumoChen
|
34f1b5d1c8
|
legion heads now swarm
|
2020-02-21 10:36:57 +00:00 |
|
|
YakumoChen
|
fdee5399d8
|
Merge pull request #22 from Citadel-Station-13/master
k
|
2020-02-21 05:20:19 -05:00 |
|
|
TrilbySpaceClone
|
9ae903187f
|
always abuzz
|
2020-02-21 04:18:24 -05:00 |
|
|
Putnam
|
146b2a35f2
|
fixed temp flavor text (for real)
|
2020-02-21 00:26:42 -08:00 |
|
|
TrilbySpaceClone
|
257cc813e2
|
Armorless
|
2020-02-21 01:10:34 -05:00 |
|
|
Trilbyspaceclone
|
38f243e1c2
|
Update language_holder.dm
|
2020-02-20 22:15:32 -05:00 |
|
|
CitadelStationBot
|
0cffb2e672
|
Automatic changelog generation for PR #11176 [ci skip]
|
2020-02-20 20:50:50 -06:00 |
|
|
Ghom
|
aceb76283f
|
Merge pull request #11176 from Putnam3145/why-what
Fixing IRV again or: how I learned to start worrying and actually hate byond
|
2020-02-21 03:50:47 +01:00 |
|
|
Putnam
|
9f9881b57e
|
this is so sad
|
2020-02-20 18:43:36 -08:00 |
|
|
CitadelStationBot
|
62ad68f1ef
|
Automatic changelog generation for PR #11156 [ci skip]
|
2020-02-20 19:47:21 -06:00 |
|
|
Ghom
|
8395ee53e7
|
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
|
2020-02-21 02:47:18 +01:00 |
|
|
CitadelStationBot
|
1f843e6c4b
|
Automatic changelog generation for PR #11163 [ci skip]
|
2020-02-20 19:43:33 -06:00 |
|
|
Ghom
|
91cbc8fb3c
|
Merge pull request #11163 from MrJWhit/update-to-teg-design
Quick TEG update
|
2020-02-21 02:43:30 +01:00 |
|
|
CitadelStationBot
|
f0599e2925
|
Automatic changelog generation for PR #10541 [ci skip]
|
2020-02-20 19:43:06 -06:00 |
|
|
Ghom
|
e92183e968
|
Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
|
2020-02-21 02:43:04 +01:00 |
|
|
keronshb
|
7a1bc9d22b
|
Fixes the travis issues
Fixes the travis issues, Exo still remains a mystery
|
2020-02-20 19:11:04 -05:00 |
|
|
Putnam
|
a49260e0ac
|
Revert "maybe this'll work."
This reverts commit 8d00f11fc1.
|
2020-02-20 16:03:00 -08:00 |
|