silicons
|
47bd3c6c7c
|
ok
|
2021-04-25 16:22:46 -07:00 |
|
silicons
|
7919f09160
|
Merge remote-tracking branch 'citadel/master' into backend_sync
|
2021-04-25 16:21:20 -07:00 |
|
silicons
|
1dbd86499c
|
others
|
2021-04-25 16:18:41 -07:00 |
|
silicons
|
d017d7df66
|
let's do that
|
2021-04-25 16:16:38 -07:00 |
|
silicons
|
9e123db32a
|
ok
|
2021-04-25 16:15:25 -07:00 |
|
CitadelStationBot
|
44c2a9eecd
|
Automatic changelog generation for PR #14642 [ci skip]
|
2021-04-25 18:10:11 -05:00 |
|
silicons
|
7c1358a39d
|
Merge pull request #14642 from SandPoot/tgui-select-equipment-menu
TGUI Select Equipment menu
|
2021-04-25 17:10:09 -06:00 |
|
silicons
|
990e74179a
|
other thing
|
2021-04-25 16:09:41 -07:00 |
|
silicons
|
9933a917ac
|
?
|
2021-04-25 16:08:33 -07:00 |
|
silicons
|
fdafe0fb84
|
vscode
|
2021-04-25 15:57:32 -07:00 |
|
silicons
|
12894384ff
|
okay
|
2021-04-25 14:17:37 -07:00 |
|
silicons
|
cf69e0fb69
|
Rename emergency_airless.dmm to emergency_construction.dmm (#14656)
|
2021-04-25 12:55:46 +02:00 |
|
SandPoot
|
c2b7140ddd
|
upload icons.dm
|
2021-04-24 21:43:12 -03:00 |
|
SandPoot
|
90661d3687
|
upload files
|
2021-04-24 21:37:01 -03:00 |
|
Changelogs
|
7cc8e5ea33
|
Automatic changelog compile [ci skip]
|
2021-04-25 00:06:57 +00:00 |
|
silicons
|
d07f1f3d30
|
Update radioactive.dm (#14615)
|
2021-04-24 21:51:53 +02:00 |
|
WanderingFox95
|
ace2f522fb
|
No more Suicidal Parrots! (Ready) (#14628)
* Modifies Parrots
They spawn from hostile triggers, not as friendly pets now.
* Removes Parrots from Gold Extracts altogether
|
2021-04-24 21:47:04 +02:00 |
|
CitadelStationBot
|
2e5f56152e
|
Automatic changelog generation for PR #14634 [ci skip]
|
2021-04-24 14:40:43 -05:00 |
|
DrPainis
|
7d6cb67c91
|
literally just changes one letter (#14634)
|
2021-04-24 21:40:41 +02:00 |
|
silicons
|
0534f70ccd
|
Update bitfields.dm (#14645)
|
2021-04-24 21:29:53 +02:00 |
|
Changelogs
|
24d0b8f108
|
Automatic changelog compile [ci skip]
|
2021-04-24 00:06:57 +00:00 |
|
Changelogs
|
358085c284
|
Automatic changelog compile [ci skip]
|
2021-04-23 00:06:34 +00:00 |
|
SandPoot
|
5bb6078def
|
upload files
|
2021-04-22 20:39:21 -03:00 |
|
Lin
|
0c5d19ecc8
|
Merge pull request #14633 from Citadel-Station-13/silicons-patch-24
fixes a slightly important thing
|
2021-04-22 18:28:35 +00:00 |
|
Changelogs
|
0404d5890a
|
Automatic changelog compile [ci skip]
|
2021-04-22 00:07:28 +00:00 |
|
CitadelStationBot
|
71915b8767
|
Automatic changelog generation for PR #14573 [ci skip]
|
2021-04-21 14:50:50 -05:00 |
|
silicons
|
75e3f5eae6
|
Merge pull request #14573 from zeroisthebiggay/eatshitanddie
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
|
2021-04-21 13:50:46 -06:00 |
|
Changelogs
|
00db1679fc
|
Automatic changelog compile [ci skip]
|
2021-04-21 00:06:45 +00:00 |
|
silicons
|
8510542260
|
Update autobunker.dm
|
2021-04-20 04:55:00 -07:00 |
|
CitadelStationBot
|
8cb23baa92
|
Automatic changelog generation for PR #14443 [ci skip]
|
2021-04-20 06:53:02 -05:00 |
|
silicons
|
f0c2188c5f
|
Merge pull request #14443 from necromanceranne/baton_change_pr
Another dreaded baton rework pr; batons knockdown and slow on rightclick (with a cooldown), otherwise stagger, plus more
|
2021-04-20 05:52:59 -06:00 |
|
Changelogs
|
9b2e6732cd
|
Automatic changelog compile [ci skip]
|
2021-04-20 00:07:13 +00:00 |
|
CitadelStationBot
|
edc10e5100
|
Automatic changelog generation for PR #14571 [ci skip]
|
2021-04-18 20:38:43 -05:00 |
|
silicons
|
821511e64e
|
Merge pull request #14571 from BlueWildrose/piracyisillegal
Space pirate sleepers can now be crowbared to be destroyed
|
2021-04-18 19:38:41 -06:00 |
|
CitadelStationBot
|
b6be757827
|
Automatic changelog generation for PR #14631 [ci skip]
|
2021-04-18 20:13:26 -05:00 |
|
silicons
|
cb87f798c3
|
Merge pull request #14631 from keronshb/slaughtereventlower
Kev please don't kill me for a one number change but this lowers Slaughter Demon Weight
|
2021-04-18 19:13:24 -06:00 |
|
keronshb
|
c872055821
|
Lowers demons weight
Bit too hjgh
|
2021-04-18 21:03:54 -04:00 |
|
CitadelStationBot
|
eca9235441
|
Automatic changelog generation for PR #14582 [ci skip]
|
2021-04-18 20:02:55 -05:00 |
|
silicons
|
74280ed082
|
Merge pull request #14582 from BlueWildrose/slimeorgans
Slimeperson organs are now unique with a unique name, therefore confusing people
|
2021-04-18 19:02:53 -06:00 |
|
BlueWildrose
|
911d8ffc12
|
requested changes
|
2021-04-18 18:02:04 -07:00 |
|
silicons
|
af7bb2e09f
|
Merge pull request #14585 from zeroisthebiggay/cumbblegum
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
|
2021-04-18 19:00:14 -06:00 |
|
silicons
|
848f1fc50d
|
Merge pull request #14578 from qweq12yt/louder-sm-delams
LOUDER DELAMS
|
2021-04-18 18:57:47 -06:00 |
|
necromanceranne
|
75e0e893a2
|
Merge branch 'master' into baton_change_pr
|
2021-04-19 10:55:33 +10:00 |
|
CitadelStationBot
|
25577396cf
|
Automatic changelog generation for PR #14546 [ci skip]
|
2021-04-18 19:53:16 -05:00 |
|
silicons
|
b41790842b
|
Merge pull request #14546 from Putnam3145/bluespace-pipe
Ports bluespace pipes from yogs
|
2021-04-18 18:53:14 -06:00 |
|
CitadelStationBot
|
cc8fb68926
|
Automatic changelog generation for PR #14543 [ci skip]
|
2021-04-18 19:52:56 -05:00 |
|
silicons
|
0dcc6b44ba
|
Merge pull request #14543 from qweq12yt/cargo-bugfixes
Cargo bugfixes
|
2021-04-18 18:52:54 -06:00 |
|
CitadelStationBot
|
1e0bef190d
|
Automatic changelog generation for PR #14625 [ci skip]
|
2021-04-18 19:52:31 -05:00 |
|
silicons
|
73d5b99b64
|
Merge pull request #14625 from Hatterhat/patch-4
solars plastitanium glass fix
|
2021-04-18 18:52:29 -06:00 |
|
CitadelStationBot
|
257b94fe3b
|
Automatic changelog generation for PR #14624 [ci skip]
|
2021-04-18 19:51:36 -05:00 |
|