1092eacc6e
Merge pull request #13397 from ArchieBeepBoop/microfans
...
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
00ab73d0a3
Merge pull request #13286 from timothyteakettle/heterochromia
...
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
b97b595f6f
Three new wooden floor types
2020-09-26 18:29:46 -04:00
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
84f240c5dd
Update holosign.dm
2020-09-25 09:50:08 -05:00
57c4a3416a
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-25 01:03:15 -07:00
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
9a17c42321
sigh
2020-09-22 01:53:16 -07:00
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
9fef16964c
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-21 03:13:51 -07:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
8ebe765d70
fixes
2020-09-20 02:03:18 -07:00
97f373a199
whew
2020-09-19 16:17:26 -07:00
1ea0dd9f76
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-19 15:56:13 -07:00
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
54f48c3754
Merge pull request #13394 from DeltaFire15/attack-runtime-fixes
...
Some bodypart-related fixes
2020-09-19 06:02:32 -07:00
139c99d82a
fix
2020-09-18 00:49:17 -07:00
4338c0207e
fix
2020-09-18 00:37:36 -07:00
b1738c7230
fix
2020-09-18 00:30:02 -07:00
d619823b9b
ok
2020-09-18 00:27:04 -07:00
a477b1d5a9
easy??
2020-09-18 00:24:31 -07:00
8d33b3a8da
convert to machinery type
2020-09-16 20:28:31 -03:00
7e00d81758
Microfan Rework
2020-09-16 19:28:59 -03:00
ca8b13b86a
Merge pull request #13255 from timothyteakettle/limbs
...
you can choose limbs to be prosthetic/amputated
2020-09-16 00:31:18 -07:00
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
95ebeac5b6
fix
2020-09-15 17:27:11 -07:00
e7220e842e
things
2020-09-15 15:29:34 -07:00
394d383746
Clone Microfans
2020-09-15 19:27:58 -03:00
f892309903
fixes
2020-09-15 17:35:58 +02:00
f13af9f72e
Made gases only display in analyzers if they have at least 0.005 moles.
2020-09-14 02:37:47 -07:00
bd183e8e28
removes an unneeded check
2020-09-13 13:27:57 +02:00
8975b93b37
no petting and not petting at the same time
2020-09-13 03:43:31 +02:00
2d8655d712
plushie shapeshifter
2020-09-13 03:25:43 +02:00
fab1523c15
nevermind
2020-09-12 01:01:36 +01:00
18d949e674
Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
...
Brass Material Datum: "Sbetr Jryy!"
2020-09-11 14:15:54 -07:00
59a089d547
too weak
2020-09-11 22:09:51 +01:00
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
348341ed80
Merge branch 'emp-rework' of https://github.com/timothyteakettle/Citadel-Station-13 into emp-rework
2020-09-10 19:17:19 +01:00
b65fecca10
yay
2020-09-10 19:16:10 +01:00
d2f4d675a4
fuck
2020-09-10 03:55:24 +01:00
6da8690bc6
woops
2020-09-10 03:50:41 +01:00
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
f1cd94fc97
emp rework
2020-09-09 23:14:06 +01:00
07b28f40de
Merge pull request #13359 from Ghommie/Ghommie-cit838
...
Turf visuals fix plus corrected names of a couple things.
2020-09-07 13:42:05 -07:00
45ee1cbbf8
Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG
...
Revert Drakeborgs
2020-09-06 15:22:16 -07:00
f8c1c829d7
maulers slam people very violently
2020-09-06 15:34:53 -05:00
4a04b22b72
Turf visuals fix plus corrected names of a couple things.
2020-09-06 18:53:01 +02:00
9e204f167f
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
...
Miner Loot Shuffle MK III
2020-09-06 01:58:46 -07:00
63b1bfd45c
Merge pull request #13303 from Citadel-Station-13/silicons-patch-27
...
combat defibs now hit for disarm + 35 stamina (old stunbaton values) instead of disarm + 75 stamina
2020-09-06 18:03:59 +12:00
silicons