Commit Graph

9625 Commits

Author SHA1 Message Date
silicons
00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
Putnam
61abfb6720 cargo cult math smh 2020-09-26 22:04:20 -07:00
Putnam
37dfbf8f33 Updated the readme a bit. 2020-09-26 21:52:16 -07:00
ItzGabby
b97b595f6f Three new wooden floor types 2020-09-26 18:29:46 -04:00
timothyteakettle
04a7c66561 fix turret removal 2020-09-26 01:38:04 +01:00
DeltaFire
178be2b643 fixes plushlings
This makes it so the snowflake id is actually set if the plush is a snowflake, and also makes plushlings not become invisible anymore if they absorb a snowflake plush
2020-09-25 23:41:18 +02:00
DeltaFire
07f50845b6 no more conditional invincibility 2020-09-25 23:24:00 +02:00
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
silicons
57c4a3416a Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-25 01:03:15 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Putnam
1c99e59552 Makes cryo pods no longer replace already-won objectives. 2020-09-23 03:39:00 -07:00
silicons
5e355dafe8 Update mecha_defense.dm 2020-09-22 04:39:43 -07:00
silicons
60a299197b Update mecha_defense.dm 2020-09-22 04:38:47 -07:00
silicons
9a17c42321 sigh 2020-09-22 01:53:16 -07:00
Putnam
e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
Putnam
556a69ac78 Removed the supermatter objective; made sabotage objectives less common. 2020-09-19 22:45:32 -07:00
silicons
97f373a199 whew 2020-09-19 16:17:26 -07:00
silicons
1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Dip
a3bf4ac580 Fixes requested 2020-09-19 13:02:08 -03:00
Putnam3145
62228905da Merge pull request #13382 from Citadel-Station-13/silicons-patch-36
hulks no longer break their hand from punching a wall
2020-09-19 06:07:04 -07:00
Putnam3145
9c305d1db6 Merge pull request #13400 from silicons/shields
adds two procs to find exterior tiles for projecting hull shields around for later pr
2020-09-19 06:06:46 -07:00
Ghom
868e464b40 fixes linter issues, removes acid degrading armor (#13399)
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
2020-09-19 15:04:48 +02:00
silicons
54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
silicons
139c99d82a fix 2020-09-18 00:49:17 -07:00
silicons
4338c0207e fix 2020-09-18 00:37:36 -07:00
silicons
b1738c7230 fix 2020-09-18 00:30:02 -07:00
silicons
d619823b9b ok 2020-09-18 00:27:04 -07:00
silicons
a477b1d5a9 easy?? 2020-09-18 00:24:31 -07:00
Dip
fa516fc517 Set atmos pass to yes on assembly 2020-09-16 20:51:40 -03:00
Dip
8d33b3a8da convert to machinery type 2020-09-16 20:28:31 -03:00
Dip
2e9265937d duplicate fan bugfix 2020-09-16 20:01:37 -03:00
Dip
7e00d81758 Microfan Rework 2020-09-16 19:28:59 -03:00
silicons
ca8b13b86a Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
silicons
17b21d29f3 helpers 2020-09-16 00:07:33 -07:00
Timothy Teakettle
12bf3aebda Merge remote-tracking branch 'upstream/master' into cool-ipcs 2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392 Merge branch 'master' into cool-ipcs 2020-09-16 05:09:02 +01:00
silicons
95ebeac5b6 fix 2020-09-15 17:27:11 -07:00
silicons
e7220e842e things 2020-09-15 15:29:34 -07:00
Dip
394d383746 Clone Microfans 2020-09-15 19:27:58 -03:00
DeltaFire
f892309903 fixes 2020-09-15 17:35:58 +02:00
Putnam
f13af9f72e Made gases only display in analyzers if they have at least 0.005 moles. 2020-09-14 02:37:47 -07:00
DeltaFire
bd183e8e28 removes an unneeded check 2020-09-13 13:27:57 +02:00
DeltaFire
8975b93b37 no petting and not petting at the same time 2020-09-13 03:43:31 +02:00
DeltaFire
2d8655d712 plushie shapeshifter 2020-09-13 03:25:43 +02:00
timothyteakettle
fab1523c15 nevermind 2020-09-12 01:01:36 +01:00
silicons
18d949e674 Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
silicons
10a753bf4d Merge pull request #13368 from Tupinambis/CoggyDoggy
Cogstation Fixes and Improvements
2020-09-11 14:14:59 -07:00