 kevinz000
|
39beca1a0f
|
Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
|
2019-09-13 10:47:15 -07:00 |
|
|
CitadelStationBot
|
ed2e73d817
|
Automatic changelog generation for PR #9241 [ci skip]
|
2019-09-13 12:46:13 -05:00 |
|
|
kevinz000
|
e107c51e19
|
Merge pull request #9241 from Linzolle/oracleui
Ports Oracle UI framework, and updates UI for paper and disposal bins.
|
2019-09-13 10:46:11 -07:00 |
|
|
CitadelStationBot
|
c0f40fc096
|
Automatic changelog generation for PR #9279 [ci skip]
|
2019-09-13 12:43:45 -05:00 |
|
|
kevinz000
|
eab0b8934f
|
Merge pull request #9279 from Ghommie/Ghommie-cit192
Fixing undergarments color preferences resetting each round.
|
2019-09-13 10:43:43 -07:00 |
|
|
CitadelStationBot
|
53f224651d
|
Automatic changelog generation for PR #9275 [ci skip]
|
2019-09-13 12:43:24 -05:00 |
|
|
kevinz000
|
591a584785
|
Merge pull request #9275 from Thalpy/InitialD
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
|
2019-09-13 10:43:22 -07:00 |
|
|
CitadelStationBot
|
8f8340f567
|
Automatic changelog generation for PR #9276 [ci skip]
|
2019-09-13 12:43:02 -05:00 |
|
|
kevinz000
|
c4f5ce67b8
|
Merge pull request #9276 from Trilbyspaceclone/war_on_fashen
Adds clip on pokadoted pants, only in 4 types for now
|
2019-09-13 10:43:00 -07:00 |
|
|
CitadelStationBot
|
f13d6a9c8c
|
Automatic changelog generation for PR #9251 [ci skip]
|
2019-09-13 12:42:44 -05:00 |
|
|
kevinz000
|
42613d1800
|
Merge pull request #9251 from Linzolle/chaplain-fashion-time
Allow all chaplain gear to equip the same things in their suit storage
|
2019-09-13 10:42:42 -07:00 |
|
|
kevinz000
|
63d2273a75
|
Merge pull request #9220 from Thalpy/Catnip-Furranium
Allows Furranium grown from organic sources.
|
2019-09-13 10:41:07 -07:00 |
|
|
kevinz000
|
4494f42155
|
Merge pull request #9270 from Linzolle/reallyguys
fixes donuts being uncraftable
|
2019-09-13 10:40:21 -07:00 |
|
|
Linzolle
|
1e6972d6cc
|
pubby fix
|
2019-09-12 23:39:58 -05:00 |
|
|
Linzolle
|
213bd2fc6b
|
fixes
|
2019-09-12 23:35:21 -05: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 |
|
|
Ghommie
|
025b6122d4
|
short colors
|
2019-09-12 02:58:34 +02:00 |
|
|
Ghommie
|
e0a29ec001
|
Fixing undergarments color resetting each round.
|
2019-09-12 02:48:26 +02:00 |
|
|
deathride58
|
4551b13547
|
[s] ports tgstation/tgstation#46425
|
2019-09-11 19:24:05 -04:00 |
|
|
Fermi
|
6b76b09449
|
Missed 2
|
2019-09-11 23:30:56 +01:00 |
|
|
TrilbySpaceClone
|
fa868ce4ff
|
fashen crime
|
2019-09-11 14:22:50 -04:00 |
|
|
Fermi
|
c79c4aafa5
|
Cleans up var/test into targetReagent
|
2019-09-11 18:51:05 +01:00 |
|
|
Fermi
|
409cbe876a
|
Okay ACTUALLY does what I want it to.
|
2019-09-11 18:46:32 +01:00 |
|
|
Fermi
|
d59196f430
|
oops
|
2019-09-11 16:38:55 +01:00 |
|
|
Linzolle
|
daba09582a
|
move to misc.dm
|
2019-09-11 10:18:10 -05: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 |
|
|
Linzolle
|
6cc92da914
|
bruh
|
2019-09-09 18:02:23 -05: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 |
|