silicons
|
1092eacc6e
|
Merge pull request #13397 from ArchieBeepBoop/microfans
Micro Powered Fans!
|
2020-09-27 00:03:43 -07:00 |
|
silicons
|
00ab73d0a3
|
Merge pull request #13286 from timothyteakettle/heterochromia
heterochromia: you can select individual eye colours
|
2020-09-27 00:01:00 -07:00 |
|
SiliconMain
|
84f240c5dd
|
Update holosign.dm
|
2020-09-25 09:50:08 -05:00 |
|
Timothy Teakettle
|
106b8ccead
|
Merge branch 'master' into heterochromia
|
2020-09-24 22:09:03 +01: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 |
|
Artur
|
435565f1d8
|
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
|
2020-09-21 00:16:12 +03: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 |
|
Dip
|
8d33b3a8da
|
convert to machinery type
|
2020-09-16 20:28:31 -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
|
95ebeac5b6
|
fix
|
2020-09-15 17:27:11 -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 |
|
silicons
|
18d949e674
|
Merge pull request #13357 from TheObserver-sys/BrassDatumDirectToYou
Brass Material Datum: "Sbetr Jryy!"
|
2020-09-11 14:15:54 -07:00 |
|
silicons
|
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 |
|
silicons
|
45ee1cbbf8
|
Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG
Revert Drakeborgs
|
2020-09-06 15:22:16 -07:00 |
|
Ghommie
|
4a04b22b72
|
Turf visuals fix plus corrected names of a couple things.
|
2020-09-06 18:53:01 +02:00 |
|
silicons
|
9e204f167f
|
Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
Miner Loot Shuffle MK III
|
2020-09-06 01:58:46 -07:00 |
|
BlackMajor
|
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 |
|
BlackMajor
|
1943a2fdd7
|
Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
|
2020-09-06 17:53:35 +12:00 |
|
BlackMajor
|
3eafab209d
|
Merge pull request #13136 from Citadel-Station-13/silicons-patch-8
the station charter rename now disallows any name with characters above a single byte in length unless an admin edits it to allow unicode
|
2020-09-06 17:50:32 +12:00 |
|
The0bserver
|
cddd46fce3
|
Maybe this will work. Maybe it won't.
|
2020-09-05 18:52:20 -04:00 |
|
silicons
|
6e6ca622e6
|
Merge pull request #13279 from Hatterhat/the-desword-block-buff
alternate to 13728 - 60% rngblock, activeblock covers sides, effectiveness against projectiles upped
|
2020-09-05 13:10:50 -07:00 |
|
silicons
|
7b50b22c7b
|
Merge pull request #13244 from lolman360/AnPrimAssistants
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
|
2020-09-05 02:20:11 -07:00 |
|
silicons
|
6527e2e9ea
|
Merge pull request #13348 from raspy-on-osu/thermomachine-why
Thermomachine boards (Freezer/Heater) now tell you how to change their pipe layer
|
2020-09-05 02:16:18 -07:00 |
|
raspy-on-osu
|
4c8983f006
|
init
|
2020-09-04 22:13:56 -04:00 |
|
silicons
|
14ebeddea2
|
Merge pull request #13304 from GrayRachnid/revert-8235-defib-notouch
Revert "Buffs defib users by making them stop pulling automatically"
|
2020-09-04 12:56:13 -07:00 |
|
Artur
|
3fb72e0fea
|
Merge remote-tracking branch 'upstream/master' into TGUI_Updoot
|
2020-09-04 11:43:31 +03:00 |
|
timothyteakettle
|
90eef6efc9
|
Merge remote-tracking branch 'upstream/master' into limbs
|
2020-09-03 22:46:32 +01:00 |
|
Cameron!
|
e3af0d654e
|
Revert "[READY] DRAKEBORGS & PLUSHIES"
|
2020-09-02 17:47:22 -07:00 |
|
Ghommie
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02:00 |
|
Artur
|
8d073bbce6
|
Merge remote-tracking branch 'upstream/master' into TGUI_Updoot
|
2020-09-02 19:05:18 +03:00 |
|
Artur
|
c79e9fbc0b
|
https://github.com/tgstation/tgstation/pull/53263
|
2020-09-02 18:48:09 +03:00 |
|
GrayRachnid
|
a7a8bb7992
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch
|
2020-09-01 23:57:06 -04:00 |
|
lolman360
|
5697ab2ff4
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-09-01 16:57:02 +10:00 |
|
silicons
|
9a4f9aef6e
|
Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam
pyro anomaly spam salt pr (offer_control now supports ignore_category)
|
2020-08-31 21:21:09 -07:00 |
|
silicons
|
db28a50953
|
Merge pull request #13310 from Putnam3145/fix-fusion-display
Makes fusion analyze not assume we're still on fusion v5
|
2020-08-31 21:20:15 -07:00 |
|
lolman360
|
05bd0579ca
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-09-01 11:23:57 +10:00 |
|
Putnam
|
6028c66ceb
|
Fixed the combat log issue
|
2020-08-30 08:26:29 -07:00 |
|
Putnam
|
4cf040a11a
|
Makes plastitanium rapier not silently poison for pacifists.
|
2020-08-30 06:25:00 -07:00 |
|
Putnam
|
9da959795c
|
Made the text make sense, again.
|
2020-08-30 05:42:21 -07:00 |
|
Putnam
|
15b5b77494
|
Replaced all the references of fusionpower to instability in results.
|
2020-08-30 03:06:36 -07:00 |
|
Putnam
|
5ba883bfe5
|
Fixes fusion power text to make sense.
|
2020-08-30 02:53:46 -07:00 |
|
silicons
|
69f6927275
|
Update broom.dm (#13058)
|
2020-08-30 09:52:54 +02:00 |
|
raspy-on-osu
|
c90c46a2d1
|
mob_spawners
|
2020-08-30 01:50:55 -04:00 |
|