Commit Graph

45391 Commits

Author SHA1 Message Date
TripleShades
e2caec8aad Update MetaStation.dmm 2021-11-24 16:08:00 -05:00
TripleShades
0f548093bb Update MetaStation.dmm 2021-11-24 16:06:31 -05:00
TripleShades
5bf52a61f3 Update MetaStation.dmm
Meta Solars Light Fixture
2021-11-24 16:04:41 -05:00
TripleShades
74437c1fb7 Update MetaStation.dmm 2021-11-24 16:01:14 -05:00
CitadelStationBot
e08cffc176 Automatic changelog generation for PR #15376 [ci skip] 2021-11-24 11:38:12 -06:00
Lin
d5c17f0d84 Merge pull request #15376 from SandPoot/double
Double beds
2021-11-24 17:38:10 +00:00
CitadelStationBot
a3fa993acd Automatic changelog generation for PR #14868 [ci skip] 2021-11-24 11:32:51 -06:00
Lin
e3a5391250 Merge pull request #14868 from Arturlang/admin_mapsave
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
Changelogs
18fd26d3fa Automatic changelog compile [ci skip] 2021-11-24 00:27:42 +00:00
CitadelStationBot
6dbdfbfa6c Automatic changelog generation for PR #15392 [ci skip] 2021-11-23 15:55:09 -06:00
Lin
f33af9b35c Merge pull request #15392 from timothyteakettle/fix-oil-drum
oil drum now recognises synthetic anthormorphs as synths
2021-11-23 21:55:07 +00:00
silicons
38f7e07bcc Update living.dm (#15394) 2021-11-23 18:36:51 +01:00
Lin
7796dcdd40 Merge pull request #15393 from Citadel-Station-13/spacehoodie
Donator - Adds Space Hoodie
2021-11-23 02:36:32 +00:00
Lin
e081ad70b6 Update custom_items.dm 2021-11-23 02:35:32 +00:00
Lin
c6c6827377 Update custom_items.dm 2021-11-23 02:35:01 +00:00
Changelogs
8ba9477755 Automatic changelog compile [ci skip] 2021-11-23 00:27:45 +00:00
CitadelStationBot
7985acdf02 Automatic changelog generation for PR #15389 [ci skip] 2021-11-22 16:02:53 -06:00
Lin
6d5882fcfd Merge pull request #15389 from TripleShades/pubby
Pubby Paramedical
2021-11-22 22:02:50 +00:00
Lin
4a8e905d27 Merge pull request #15390 from jakeramsay007/mixing-strings-and-integers-makes-coders-very-sad
Fixes grenade timer changes
2021-11-22 17:47:12 +00:00
Jay
a701aece04 adds space hoodie
removed dupes in custom_w.dmi
2021-11-21 19:49:32 -06:00
Changelogs
542cbdc6db Automatic changelog compile [ci skip] 2021-11-22 00:27:31 +00:00
Timothy Teakettle
d9276418ae Update anthropomorph.dm 2021-11-22 00:15:42 +00:00
Chayse Ramsay
31a0de04d5 Fixes chem nades too, since fixing grenades as a whole broke them changing timer 2021-11-21 06:24:55 +00:00
Chayse Ramsay
9545b180c6 Update grenade.dm 2021-11-21 06:08:20 +00:00
Changelogs
f6ff310849 Automatic changelog compile [ci skip] 2021-11-21 00:28:42 +00:00
TripleShades
df90a71acb Update PubbyStation.dmm 2021-11-20 18:24:55 -05:00
TripleShades
9a22ab202c Update PubbyStation.dmm 2021-11-20 18:19:48 -05:00
TripleShades
29a257c71c Update PubbyStation.dmm 2021-11-20 18:16:14 -05:00
CitadelStationBot
dfc74c2d52 Automatic changelog generation for PR #15308 [ci skip] 2021-11-20 11:57:55 -06:00
Letter N
84fb6213a2 Adds search box on cwc slab (#15308)
* cwc search oh and look, text that you can see

* absolutely unsafe

* Update ClockworkSlab.js
2021-11-20 18:57:52 +01:00
CitadelStationBot
1ec9041ce1 Automatic changelog generation for PR #15377 [ci skip] 2021-11-20 01:06:40 -06:00
Lin
25cfe1ff25 Merge pull request #15377 from TripleShades/pubby
Pubby Surgery + Loot Piles
2021-11-20 07:06:38 +00:00
CitadelStationBot
0e0c49d461 Automatic changelog generation for PR #15381 [ci skip] 2021-11-20 01:04:17 -06:00
Lin
5b0fe8d392 Merge pull request #15381 from DeltaFire15/battery-supply
Synthetics can now hook up their power cord to cells instead of relying on moth-esque code
2021-11-20 07:04:15 +00:00
CitadelStationBot
78bad3402a Automatic changelog generation for PR #15382 [ci skip] 2021-11-20 01:03:35 -06:00
Lin
22d297abe8 Merge pull request #15382 from keronshb/clockworkupdates
Allows Clockwork cultists to create Cogscarabs.
2021-11-20 07:03:32 +00:00
Lin
1de965a90e Merge pull request #15385 from buffyuwu/crayons.dm
dont color my entire canvas neon green when im painting please
2021-11-20 03:36:38 +00:00
CitadelStationBot
76c39bc6a4 Automatic changelog generation for PR #15383 [ci skip] 2021-11-19 21:35:59 -06:00
Lin
d395824007 Merge pull request #15383 from MrJWhit/thinnining-trash
Thins up the loot piles
2021-11-20 03:35:56 +00:00
Changelogs
07567dba89 Automatic changelog compile [ci skip] 2021-11-20 00:26:56 +00:00
TripleShades
ac365f374b Update PubbyStation.dmm 2021-11-19 18:07:02 -05:00
TripleShades
2eb3c3326b Update PubbyStation.dmm 2021-11-19 18:06:06 -05:00
TripleShades
52814b8d36 Update PubbyStation.dmm 2021-11-19 18:02:53 -05:00
CitadelStationBot
438d965180 Automatic changelog generation for PR #15384 [ci skip] 2021-11-19 17:02:52 -06:00
Lin
43e4c71d04 Merge pull request #15384 from SandPoot/acid-bgone
Acid overlay no longer lingers after done
2021-11-19 23:02:49 +00:00
Artur
99dedb54ed Merge remote-tracking branch 'upstream/master' into admin_mapsave 2021-11-20 00:16:56 +02:00
Putnam3145
cf4cc39a3b Merge pull request #15222 from raspy-on-osu/apcfix
save hours of pain for new engineers with this one simple trick!! click here to find out
2021-11-18 20:18:11 -08:00
buffyuwu
612087f7e5 Update crayons.dm 2021-11-18 20:44:01 -05:00
Changelogs
856caa4d26 Automatic changelog compile [ci skip] 2021-11-19 00:27:25 +00:00
SandPoot
9d3857c94e Upload files 2021-11-18 14:57:19 -03:00