 Fermi
|
cb614bcd95
|
Merge branch 'master' into Dispencer-UI-change
|
2021-01-17 22:19:45 +00:00 |
|
|
Fermi
|
2fcaa637f5
|
Merge remote-tracking branch 'upstream/master'
|
2021-01-17 22:19:12 +00:00 |
|
|
Thalpy
|
e58b7f2f31
|
Merge pull request #40 from Thalpy/tgs-dmapi-update
Automatic TGS DMAPI Update
|
2021-01-17 22:18:09 +00:00 |
|
|
CitadelStationBot
|
668da87dca
|
Automatic changelog generation for PR #14040 [ci skip]
|
2021-01-15 11:52:12 -06:00 |
|
|
DeltaFire
|
7bdfa34321
|
Merge pull request #14040 from LetterN/fix-tgui
fixes pda logs
|
2021-01-15 18:52:08 +01:00 |
|
|
CitadelStationBot
|
8333d6309c
|
Automatic changelog generation for PR #14044 [ci skip]
|
2021-01-15 11:50:16 -06:00 |
|
|
DeltaFire
|
3e917653c7
|
Merge pull request #14044 from corin9090/beadies
Belt slot prayer beads
|
2021-01-15 18:50:14 +01:00 |
|
|
DeltaFire
|
d331dd4b1e
|
Merge pull request #14046 from Citadel-Station-13/silicons-patch-10
buffs and fixes BOOMERANG STUNBATONS
|
2021-01-15 18:30:32 +01:00 |
|
|
DeltaFire
|
de40e96180
|
Merge pull request #14047 from Citadel-Station-13/silicons-patch-11
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
|
2021-01-15 18:30:16 +01:00 |
|
|
CitadelStationBot
|
26a38f1868
|
Automatic changelog generation for PR #14048 [ci skip]
|
2021-01-15 11:24:21 -06:00 |
|
|
DeltaFire
|
a0e6b45111
|
Merge pull request #14048 from MrJWhit/hey-this-tip-of-the-round-is-wrong
Hey this Tip Of The Round is wrong.
|
2021-01-15 18:24:17 +01:00 |
|
|
CitadelStationBot
|
3f170845e4
|
Automatic changelog generation for PR #14054 [ci skip]
|
2021-01-15 11:22:08 -06:00 |
|
|
DeltaFire
|
aa1cae9f33
|
Merge pull request #14054 from TheObserver-sys/AReturnToForm
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
|
2021-01-15 18:22:05 +01:00 |
|
|
DeltaFire
|
f1d254f4e5
|
Merge pull request #14057 from Citadel-Station-13/silicons-patch-15
removes stealthmin orbit block
|
2021-01-15 18:15:56 +01:00 |
|
|
CitadelStationBot
|
9cba09dae8
|
Automatic changelog generation for PR #14060 [ci skip]
|
2021-01-15 11:14:46 -06:00 |
|
|
DeltaFire
|
771a4f3c41
|
Merge pull request #14060 from Hatterhat/shrink-removal
removes shrink ray again because "wait, whose idea was to readd this?" (turns out it was shoehorned back in by lettern during the tgui port)
|
2021-01-15 18:14:42 +01:00 |
|
|
DeltaFire
|
bae7d37a89
|
Merge pull request #14064 from Citadel-Station-13/silicons-patch-16
s] nothing to see here move on
|
2021-01-15 18:13:08 +01:00 |
|
|
CitadelStationBot
|
90490033d3
|
Automatic changelog generation for PR #14042 [ci skip]
|
2021-01-15 05:00:11 -06:00 |
|
|
silicons
|
68e9be9647
|
Merge pull request #14042 from kiwedespars/dildo-1
adds klonk sound effect for literal horsecock dildo
|
2021-01-15 04:00:08 -07:00 |
|
|
silicons
|
89fd802b8f
|
Update respawns.txt
|
2021-01-15 02:55:28 -07:00 |
|
|
CitadelStationBot
|
39996111fa
|
Automatic changelog generation for PR #14062 [ci skip]
|
2021-01-15 03:55:06 -06:00 |
|
|
silicons
|
beea362967
|
Merge pull request #14062 from kappa-sama/kaiofix
i don't wanna talk about it
|
2021-01-15 02:55:02 -07:00 |
|
|
kappa-sama
|
1134e1ce20
|
i don't wanna talk about it
|
2021-01-15 00:36:45 -05:00 |
|
|
Hatterhat
|
a468f400e3
|
see branch name
|
2021-01-14 20:55:06 -06:00 |
|
|
silicons
|
ecd3e6188d
|
Update unsorted.dm
|
2021-01-14 19:30:13 -07:00 |
|
|
silicons
|
faf210ead0
|
Update unsorted.dm
|
2021-01-14 18:36:00 -07:00 |
|
|
The0bserver
|
b91df1403e
|
The lack of recevier. It is the opposite of funny!
|
2021-01-14 01:31:58 -05:00 |
|
|
The0bserver
|
e01c57c832
|
Show me the opposite of funny!
|
2021-01-14 01:12:53 -05:00 |
|
|
The0bserver
|
1b469bdfda
|
The power of overwriting...
|
2021-01-14 01:03:48 -05:00 |
|
|
silicons
|
1df2257e61
|
Merge pull request #14052 from SiliconMain/baitbegone
Update engineering.dm
|
2021-01-13 22:43:01 -07:00 |
|
|
SiliconMain
|
cccb547a72
|
Update engineering.dm
|
2021-01-13 23:41:49 -06:00 |
|
|
The0bserver
|
d957c1d105
|
another tweak
|
2021-01-14 00:02:32 -05:00 |
|
|
The0bserver
|
ffe401544c
|
First wave of fixing
|
2021-01-13 23:35:37 -05:00 |
|
|
The0bserver
|
55cd69746d
|
A change in tact, perhaps?
|
2021-01-13 23:08:05 -05:00 |
|
|
CitadelStationBot
|
109b61df9a
|
Automatic changelog generation for PR #14039 [ci skip]
|
2021-01-13 22:02:26 -06:00 |
|
|
silicons
|
28849dd8e9
|
Merge pull request #14039 from Hatterhat/sticky-start
on the precipice of stickiness - sticky tape roundstart tech
|
2021-01-13 21:02:23 -07:00 |
|
|
The0bserver
|
2b8b9086ec
|
Revert "Initial Commit:Goodbye rifle! You won't be missed!"
This reverts commit 1836d0106a.
|
2021-01-13 22:14:36 -05:00 |
|
|
The0bserver
|
1836d0106a
|
Initial Commit:Goodbye rifle! You won't be missed!
|
2021-01-13 21:42:08 -05:00 |
|
|
The0bserver
|
49155c9d13
|
Merge remote-tracking branch 'Upstream/master'
|
2021-01-13 20:02:28 -05:00 |
|
|
CitadelStationBot
|
23ad56d880
|
Automatic changelog generation for PR #13975 [ci skip]
|
2021-01-13 17:58:07 -06:00 |
|
|
silicons
|
aa830b257a
|
Merge pull request #13975 from zeroisthebiggay/paramed
resprites paramedic softsuit to not violate r*d cr*ss copyright and resprites the paramedic closet
|
2021-01-13 16:58:04 -07:00 |
|
|
CitadelStationBot
|
71c73905ce
|
Automatic changelog generation for PR #14021 [ci skip]
|
2021-01-13 17:57:45 -06:00 |
|
|
silicons
|
ce0891c2eb
|
Merge pull request #14021 from DeltaFire15/emp-fuckeroni
Fixes combat mode being permanently disabled under specific circumstances
|
2021-01-13 16:57:42 -07:00 |
|
|
CitadelStationBot
|
a78e723cc0
|
Automatic changelog generation for PR #14034 [ci skip]
|
2021-01-13 17:53:20 -06:00 |
|
|
silicons
|
82cc5da8df
|
Merge pull request #14034 from DeltaFire15/blindness-edgecase-fix
Fixes some edge cases regarding system corruption
|
2021-01-13 16:53:17 -07:00 |
|
|
CitadelStationBot
|
925d9bfaba
|
Automatic changelog generation for PR #14035 [ci skip]
|
2021-01-13 17:53:04 -06:00 |
|
|
silicons
|
bcb2e16cef
|
Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
|
2021-01-13 16:53:01 -07:00 |
|
|
CitadelStationBot
|
a2ed0fddae
|
Automatic changelog generation for PR #14032 [ci skip]
|
2021-01-13 17:50:53 -06:00 |
|
|
silicons
|
c66874f732
|
Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
|
2021-01-13 16:50:50 -07:00 |
|
|
CitadelStationBot
|
50cd6cf393
|
Automatic changelog generation for PR #14025 [ci skip]
|
2021-01-13 17:48:08 -06:00 |
|