 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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
Timothy Teakettle
|
59a089d547
|
too weak
|
2020-09-11 22:09:51 +01:00 |
|
|
Timothy Teakettle
|
58737e42b9
|
empulse using range
|
2020-09-10 19:52:34 +01:00 |
|
|
Timothy Teakettle
|
348341ed80
|
Merge branch 'emp-rework' of https://github.com/timothyteakettle/Citadel-Station-13 into emp-rework
|
2020-09-10 19:17:19 +01:00 |
|
|
Timothy Teakettle
|
b65fecca10
|
yay
|
2020-09-10 19:16:10 +01:00 |
|
|
timothyteakettle
|
d2f4d675a4
|
fuck
|
2020-09-10 03:55:24 +01:00 |
|
|
timothyteakettle
|
6da8690bc6
|
woops
|
2020-09-10 03:50:41 +01:00 |
|
|
timothyteakettle
|
e0f44ef717
|
new emps
|
2020-09-10 03:49:47 +01:00 |
|
|
Timothy Teakettle
|
f1cd94fc97
|
emp rework
|
2020-09-09 23:14:06 +01: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 |
|
|
Hatterhat
|
f8c1c829d7
|
maulers slam people very violently
|
2020-09-06 15:34:53 -05: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 |
|