 SandPoot
|
3de08a74e7
|
Upload files
|
2021-10-07 12:32:20 -03:00 |
|
|
SandPoot
|
39e63d5ac8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2021-10-06 14:49:27 -03:00 |
|
|
keronshb
|
5451e5d4d7
|
Space Dragon gust no longer hardstuns. (#15243)
* Removes hardstun
* oops adds the disarm
|
2021-10-06 17:30:13 +02:00 |
|
|
Chayse Ramsay
|
d1611ddf42
|
Lavaland ruin rad storm fix (#15242)
* Lavaland rad storm fix
* whoops
* double whoops
* Update Lavaland.dmm
|
2021-10-06 17:28:29 +02:00 |
|
|
Tupinambis
|
383f4423ac
|
Why can't xenos eat rats and stuff. This fixes that. (#15227)
|
2021-10-06 17:19:59 +02:00 |
|
|
Chayse Ramsay
|
76fa85e683
|
Cyborg module sorting fixed (#15241)
|
2021-10-06 17:16:10 +02:00 |
|
|
Changelogs
|
fa4f6dc612
|
Automatic changelog compile [ci skip]
|
2021-10-06 00:27:55 +00:00 |
|
|
Lin
|
3f50e836cc
|
Merge pull request #15238 from DeltaFire15/nanitedefibs
Nanite defibs now heal oxygen damage akin to defibs, also adds the revival memory policy to them
|
2021-10-05 16:25:59 -07:00 |
|
|
Lin
|
8f9a2b6d0c
|
Merge pull request #15235 from silicons/pai_radio_Stuff
redoes how pai emp silencing works
|
2021-10-05 12:32:23 -07:00 |
|
|
Lin
|
88db62f03f
|
Merge pull request #15239 from jakeramsay007/7.12x82mm-Fix
7.12x82mm Match Ammo box sprite fixed
|
2021-10-05 12:21:10 -07:00 |
|
|
Lin
|
1b8c72285f
|
Merge pull request #15236 from silicons/decon
fixes computer boards disappearing on decon
|
2021-10-05 12:14:00 -07:00 |
|
|
Lin
|
526e771e27
|
Merge pull request #15240 from jakeramsay007/Fix-15193
Advanced retractor sprite fix
|
2021-10-05 12:12:51 -07:00 |
|
|
silicons
|
73d6266f89
|
fix (#15248)
|
2021-10-05 19:42:26 +02:00 |
|
|
Lin
|
b18fbe695a
|
Merge pull request #15233 from SandPoot/misc-fixes
Some random fixes
|
2021-10-05 10:27:19 -07:00 |
|
|
Lin
|
d10fa48e29
|
Merge pull request #15237 from DeltaFire15/phobia-redtext
Fixes phobias just deleting trigger words, also highlights all of them
|
2021-10-05 10:22:17 -07:00 |
|
|
Chayse Ramsay
|
4d2e81d73c
|
newline
|
2021-10-05 02:52:50 +01:00 |
|
|
Changelogs
|
a2e066a9f6
|
Automatic changelog compile [ci skip]
|
2021-10-05 00:28:07 +00:00 |
|
|
SandPoot
|
2de686f4d6
|
sync
|
2021-10-04 21:25:03 -03:00 |
|
|
Chayse Ramsay
|
e642bfc3c7
|
Update surgery.dmi
|
2021-10-04 19:25:55 +01:00 |
|
|
Chayse Ramsay
|
6f0722ab48
|
Ammo box sprite fixed
|
2021-10-04 18:36:17 +01:00 |
|
|
DeltaFire
|
97eb42b35b
|
defib policy hook & oxyheal
|
2021-10-04 15:49:12 +02:00 |
|
|
DeltaFire
|
cd570be827
|
woo
|
2021-10-04 15:03:56 +02:00 |
|
|
Changelogs
|
121dcf4d55
|
Automatic changelog compile [ci skip]
|
2021-10-04 00:29:36 +00:00 |
|
|
silicons
|
f5e52f810d
|
I HATE YOU
|
2021-10-03 13:54:58 -07:00 |
|
|
silicons
|
715251dea1
|
wack
|
2021-10-03 13:25:30 -07:00 |
|
|
silicons
|
6f58f18cef
|
thank you wanderingfox
|
2021-10-03 13:18:20 -07:00 |
|
|
silicons
|
bac7bc3fb6
|
fix
|
2021-10-03 11:29:32 -07:00 |
|
|
silicons
|
f024318810
|
Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul
Tribal Crafting Overhauled & Expanded
|
2021-10-03 11:20:55 -07:00 |
|
|
silicons
|
31467420d7
|
Merge pull request #15221 from SandPoot/colormate
Colormate tgui + minor tgui updates
|
2021-10-03 08:51:51 -07:00 |
|
|
SandPoot
|
887e79aaf0
|
Update Colormate.js
|
2021-10-02 23:00:16 -03:00 |
|
|
SandPoot
|
1c80169f22
|
Update shields.dm
|
2021-10-02 22:35:54 -03:00 |
|
|
SandPoot
|
95b814d47e
|
Upload files
|
2021-10-02 22:29:01 -03:00 |
|
|
WanderingFox95
|
239cca0d86
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-10-02 17:27:24 +02:00 |
|
|
Changelogs
|
b688432b5d
|
Automatic changelog compile [ci skip]
|
2021-10-02 00:25:44 +00:00 |
|
|
WanderingFox95
|
83987db48a
|
Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul
|
2021-10-01 18:51:46 +02:00 |
|
|
SandPoot
|
5bf095ed7f
|
Adds tips to matrix
|
2021-09-30 12:08:32 -03:00 |
|
|
Putnam3145
|
826ccbe40c
|
Merge pull request #15214 from qweq12yt/grab-bag-bug-fixing
[Fix] Grab bag bug fixing
|
2021-09-29 18:56:17 -07:00 |
|
|
Changelogs
|
0011796994
|
Automatic changelog compile [ci skip]
|
2021-09-30 00:29:02 +00:00 |
|
|
CitadelStationBot
|
4c06ca4be9
|
Automatic changelog generation for PR #15216 [ci skip]
|
2021-09-29 13:18:13 -05:00 |
|
|
Hatterhat
|
469387881f
|
live eggs? in 2021? (#15216)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
|
2021-09-29 20:18:11 +02:00 |
|
|
CitadelStationBot
|
ed7118d721
|
Automatic changelog generation for PR #15217 [ci skip]
|
2021-09-29 11:52:08 -05:00 |
|
|
Putnam3145
|
a0a9089ce0
|
Removes "play on same board" from minesweeper (#15217)
|
2021-09-29 18:52:05 +02:00 |
|
|
SandPoot
|
6af4168513
|
Update Colormate.js
|
2021-09-28 22:27:00 -03:00 |
|
|
SandPoot
|
b23b88524d
|
Upload files
|
2021-09-28 22:03:17 -03:00 |
|
|
Changelogs
|
c5d0cfccc6
|
Automatic changelog compile [ci skip]
|
2021-09-29 00:25:59 +00:00 |
|
|
CitadelStationBot
|
caf68e62f5
|
Automatic changelog generation for PR #15218 [ci skip]
|
2021-09-28 11:01:53 -05:00 |
|
|
silicons
|
0a97913ce1
|
Merge pull request #15218 from zeroisthebiggay/NI
fixes a floating fire extinguisher on meta prison thanks kevinz for pressing the wrong button dork
|
2021-09-28 09:01:50 -07:00 |
|
|
zerothebigboy
|
8aef919c19
|
NI
|
2021-09-28 03:17:46 -04:00 |
|
|
CitadelStationBot
|
d71d87e40d
|
Automatic changelog generation for PR #15199 [ci skip]
|
2021-09-28 02:17:26 -05:00 |
|
|
silicons
|
770942e35d
|
Merge pull request #15199 from zeroisthebiggay/patch-26
removes motivation player lock; halves the motivation's price; allows motivation to discount.
|
2021-09-28 00:17:23 -07:00 |
|