Commit Graph

45908 Commits

Author SHA1 Message Date
CitadelStationBot
de3e961573 Automatic changelog generation for PR #15493 [ci skip] 2022-02-04 09:55:35 -06:00
silicons
5400def46a Merge pull request #15493 from SandPoot/bots-tgui
Ports Simplebot TGUI conversion
2022-02-04 07:55:32 -08:00
CitadelStationBot
67ce181aff Automatic changelog generation for PR #15494 [ci skip] 2022-02-04 09:55:26 -06:00
silicons
be0aba492f Merge pull request #15494 from SandPoot/custom-shuttle-ui
TGUIzes the Custom Shuttle
2022-02-04 07:55:23 -08:00
CitadelStationBot
c75c498684 Automatic changelog generation for PR #15466 [ci skip] 2022-02-03 21:34:17 -06:00
Sakura
08b38a7e70 Ashwalker Update (#15466)
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-02-03 19:34:15 -08:00
Changelogs
72ca4b6a8e Automatic changelog compile [ci skip] 2022-02-04 00:29:03 +00:00
Changelogs
ff31a6cda1 Automatic changelog compile [ci skip] 2022-02-03 00:29:06 +00:00
SandPoot
0fca5f80eb i have three different js linters and one says that the other is wrong. 2022-02-02 18:51:26 -03:00
SandPoot
8acb800301 Upload files 2022-02-02 17:57:48 -03:00
SandPoot
6d2680d7ec Update files 2022-02-02 12:31:20 -03:00
SandPoot
a444672abe Cit 2022-02-02 02:38:08 -03:00
SandPoot
283830a9ed oops 2022-02-02 02:17:09 -03:00
SandPoot
e3a4542ddd PLEASE DON'T MERGE WHEN I- AAAAAAAA 2022-02-02 02:12:13 -03:00
SandPoot
4c93bfc764 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-02 02:07:13 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
CitadelStationBot
79058b2b6d Automatic changelog generation for PR #15488 [ci skip] 2022-02-01 22:59:39 -06:00
Lin
daa8032712 Merge pull request #15488 from BlueWildrose/getouttathewaynerd
Get out of the way, you weaboos. The slimes were here first.
2022-02-02 04:59:36 +00:00
Lin
cc3ea5bf7d Merge pull request #14804 from Citadel-Station-13/pokerchips
[Ready] pokerchip set donator item
2022-02-02 04:59:17 +00:00
Linzolle
ab6f305805 Merge branch 'pokerchips' of github.com:Citadel-Station-13/Citadel-Station-13 2022-02-01 21:50:26 -07:00
SandPoot
760ed48476 Upload files 2022-02-02 00:45:32 -03:00
Changelogs
03f0eae6f7 Automatic changelog compile [ci skip] 2022-02-02 00:31:30 +00:00
Changelogs
5599b43f3b Automatic changelog compile [ci skip] 2022-02-01 00:30:22 +00:00
CitadelStationBot
1bdac7efea Automatic changelog generation for PR #15490 [ci skip] 2022-01-31 18:24:20 -06:00
silicons
7a95fb03ff Merge pull request #15490 from SpiWat/patch-2
Tweenty --> Twenty
2022-01-31 17:24:17 -07:00
SpiWat
386a7480a7 Tweenty -> Twenty
Spelling.
2022-01-31 19:12:00 -05:00
BlueWildrose
a6237d41fa Rachnidian: r -> c 2022-01-31 01:55:39 -07:00
BlueWildrose
674dbaac1e Neo-kanji: k -> j 2022-01-31 01:55:10 -07:00
BlueWildrose
8cb9f17f1e Dwarvish: D -> w 2022-01-31 01:54:49 -07:00
BlueWildrose
1d2b30d07d sylvan language now speakable for real 2022-01-31 01:40:37 -07:00
DeltaFire
04d806c700 orange
stabilized orange can now cool at most 5 per tick instead of infinite

robots only cool half, which means 5 per life tick (status effects fire twice per life tick total)

for robots, it cools towards ~ -100°C target temp, provided you are in a location that supports it.
2022-01-31 00:50:22 +01:00
SandPoot
6e1c221e03 Update screen_object.dm 2022-01-29 23:45:44 -03:00
Changelogs
e75bc8ff14 Automatic changelog compile [ci skip] 2022-01-30 00:29:44 +00:00
DeltaFire
e71e86cf23 adapted 2022-01-29 16:43:03 +01:00
Changelogs
609b3898bd Automatic changelog compile [ci skip] 2022-01-29 00:27:07 +00:00
CitadelStationBot
1d4c3661f2 Automatic changelog generation for PR #15483 [ci skip] 2022-01-28 04:37:05 -06:00
silicons
45662dae6f Merge pull request #15483 from Arturlang/paperSheet
Fixes linter errors && PaperSheet not working
2022-01-28 02:37:01 -08:00
Changelogs
23fccc0ed6 Automatic changelog compile [ci skip] 2022-01-28 00:28:40 +00:00
CitadelStationBot
f5e57e7f49 Automatic changelog generation for PR #15477 [ci skip] 2022-01-27 18:06:25 -06:00
Lin
ba17f7180a Merge pull request #15477 from DeltaFire15/hunt-for-that-one-beaker
Certain reagents are once again invalid for blood dna relaying and therefore podcloning / decal detscanning.
2022-01-28 00:06:22 +00:00
CitadelStationBot
33f68d4cf5 Automatic changelog generation for PR #15479 [ci skip] 2022-01-27 17:51:09 -06:00
Lin
9cb86d3c79 Merge pull request #15479 from SpiWat/patch-1
The book has 10 pagess remaining.
2022-01-27 23:51:07 +00:00
Artur
8a4e12500c Fixes linter errors && PaperSheet not working 2022-01-27 19:49:14 +02:00
Changelogs
2b1964e460 Automatic changelog compile [ci skip] 2022-01-27 00:28:55 +00:00
Changelogs
f1ecf50f0f Automatic changelog compile [ci skip] 2022-01-26 00:32:51 +00:00
SandPoot
5fbfde96df Update layers_planes.dm 2022-01-25 14:47:57 -03:00
SandPoot
aee811078a Merge branch 'master' of https://github.com/SandPoot/Citadel-Station-13 into balloon-alert-port 2022-01-25 14:41:34 -03:00
SandPoot
5bca0fb563 Upload files 2022-01-25 14:32:25 -03:00
SandPoot
de35e561b5 Update files 2022-01-25 12:52:11 -03:00
SandPoot
aac92ef029 Update mob.dm 2022-01-25 12:40:57 -03:00