Fermi
80997e4ef3
Works.
2019-09-13 23:06:09 +01:00
Fermi
04b492924b
Works kinda
2019-09-13 20:23:07 +01:00
Fermi
87de05622e
Justin case
2019-09-13 19:26:20 +01:00
Fermi
eeddcfa295
I think it works, well, not sure about the CR stuff
2019-09-13 19:22:05 +01:00
Fermi
44cff04515
Atom stop crashing pls
2019-09-13 18:03:39 +01:00
CitadelStationBot
de19b4f805
Automatic changelog generation for PR #9278 [ci skip]
2019-09-12 14:10:04 -05:00
kevinz000
39b840b180
Merge pull request #9278 from deathride58/fuckkeydown
...
[s] ports tgstation/tgstation#46425
2019-09-12 12:10:01 -07:00
CitadelStationBot
e48fe1bbe3
Automatic changelog generation for PR #9086 [ci skip]
2019-09-12 01:37:59 -05:00
BlackMajor
7e7527dcfe
Merge pull request #9086 from Sishen1542/DYNAMIC-ENTRY
...
Ports dynamic gamemode from /vg/ + also normalizes head/antag restrictions
2019-09-12 18:37:56 +12:00
deathride58
4551b13547
[s] ports tgstation/tgstation#46425
2019-09-11 19:24:05 -04:00
CitadelStationBot
e6ac254ded
Automatic changelog generation for PR #9260 [ci skip]
2019-09-11 05:26:55 -05:00
kevinz000
f4bff19592
Merge pull request #9260 from dapnee/trim-decals
...
Ports trim decals
2019-09-11 03:26:47 -07:00
CitadelStationBot
df8b4c86ae
Automatic changelog generation for PR #9147 [ci skip]
2019-09-11 00:06:38 -05:00
kevinz000
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
CitadelStationBot
e9a4e732c0
Automatic changelog generation for PR #9077 [ci skip]
2019-09-11 00:04:51 -05:00
kevinz000
076b6c8699
Merge pull request #9077 from Sishen1542/id-boingo
...
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
CitadelStationBot
fcce5f976f
Automatic changelog generation for PR #9247 [ci skip]
2019-09-10 12:27:43 -05:00
kevinz000
829a2615c5
Merge pull request #9247 from Thalpy/QuantFix
...
Partially fixes tiny runaway decimals in reagents.
2019-09-10 10:27:40 -07:00
kevinz000
8a1e097ba7
Merge pull request #9243 from BlackMajor/Doggo-sit
...
Updates dogborg sprites and some.
2019-09-09 17:54:19 -07:00
BlackMajor
7ef06427c5
Removes the medihound red crosses
2019-09-10 11:07:54 +12:00
BlackMajor
0b581a1ded
Merge branch 'master' into Doggo-sit
2019-09-10 11:02:57 +12:00
kevinz000
ef700e77d9
Merge pull request #9266 from BlackMajor/master
...
In an extremely convoluted manner, resolves a merge conflict.
2019-09-09 09:39:48 -07:00
BlackMajor
2db95cf164
Yes this is how github works.
2019-09-09 21:16:06 +12:00
BlackMajor
ede9716d98
Yeet
2019-09-09 21:12:40 +12:00
BlackMajor
9d32f5a6cd
Merge pull request #11 from Citadel-Station-13/master
...
Just updating my master
2019-09-09 21:11:21 +12:00
BlackMajor
e1e6496976
Me no comprendo github conflicts right now
2019-09-09 21:08:24 +12:00
BlackMajor
54edb7553a
Thank you github very cool
2019-09-09 21:02:32 +12:00
BlackMajor
683f46a051
Fuck
2019-09-09 20:57:32 +12:00
BlackMajor
574d41ff09
This better work
2019-09-09 20:55:23 +12:00
BlackMajor
8239f28944
FINE WE'LL DO IT YOUR WAY
2019-09-09 20:54:20 +12:00
BlackMajor
ce962490e3
Dab on merge conflict part 2
2019-09-09 20:52:08 +12:00
BlackMajor
a29fc4205f
Dab on merge conflict part 1
2019-09-09 20:51:01 +12:00
BlackMajor
c824f4a6fe
Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross
2019-09-09 20:38:51 +12:00
kevinz000
dbb4e43c17
Merge pull request #9264 from Citadel-Station-13/BlackMajor-patch-1
...
Discord invite was invalid, updates it.
2019-09-08 22:18:54 -07:00
BlackMajor
f1fafb7f5f
Discord invite was invalid, updates it.
2019-09-09 17:17:28 +12:00
CitadelStationBot
97d511b0b8
Automatic changelog generation for PR #9249 [ci skip]
2019-09-08 18:49:46 -05:00
nik707
11846849cf
Merge pull request #9249 from Trilbyspaceclone/patch-224
...
Clean bot now cleans Cumstains, glitter, tiny glass shards and more!
2019-09-08 19:49:44 -04:00
nik707
bfbf9f2492
Merge pull request #9254 from Citadel-Station-13/gloria-plushie
...
Adds Gloria Redwood plushie as well as heichou's plushies.
2019-09-08 19:47:50 -04:00
CitadelStationBot
17e15da98e
Automatic changelog generation for PR #9256 [ci skip]
2019-09-08 18:46:10 -05:00
nik707
de055fe289
Merge pull request #9256 from Thalpy/INFINITE-FERMIES
...
[Consider speedmerging] Fixes the infinite clone problem.
2019-09-08 19:46:08 -04:00
nik707
42abad4c63
Merge pull request #9261 from Citadel-Station-13/kevinz000-patch-81
...
[s] fixes a bug
2019-09-08 14:25:22 -05:00
kevinz000
7843e070ff
Update mob.dm
2019-09-08 12:13:24 -07:00
Dap
9f275ebf01
Ports trim decals
...
## About The Pull Request
So smooth, so helpful. These decals can be used to point newer players to departments, or as trim to border departments.
## Changelog
🆑
add: Trim lines!
/🆑
2019-09-08 10:51:05 -06:00
Fermi
033057d380
OOPS
2019-09-08 02:55:40 +01:00
kevinz000
e793c1abcb
Delete plushes (2).dmi
2019-09-07 17:15:27 -07:00
kevinz000
0abef923b4
Add files via upload
2019-09-07 17:14:47 -07:00
kevinz000
cfdbb54245
Add files via upload
2019-09-07 17:13:59 -07:00
kevinz000
3e9d37e70d
Update plushes.dm
2019-09-07 17:13:21 -07:00
kevinz000
cd4403911b
Delete plushes.dmi
2019-09-07 17:03:27 -07:00
kevinz000
b8374feafd
Update plushes.dm
2019-09-07 17:03:06 -07:00
