Commit Graph

19663 Commits

Author SHA1 Message Date
Artur
ec4fc35593 Missed these.. 2021-07-29 20:33:16 +03:00
Artur
6023710c06 Actually we don't have looping sounds 2021-07-29 20:28:34 +03:00
Artur
d0a6e95793 gravitygenerator.dm now pretty much equal to tg's
Minus toggle_machine_stat and machine_stat mostly
2021-07-29 20:26:04 +03:00
Artur
2fec997e1f No longer neccesary 2021-07-29 20:12:38 +03:00
Artur
4b2bffdff0 Actually makes it work by /obj/screen --> /atom/movable/screen 2021-07-29 14:06:18 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam3145
639630b4fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into reenable-tests 2021-07-27 19:05:00 -07:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
Artur
3100f98b90 https://github.com/tgstation/tgstation/pull/57915 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Artur
d185c5a3e9 Re-adds the badmin nanite hub 2021-07-28 02:13:24 +03:00
Lin
b1bdc8bf99 Merge pull request #14967 from Putnam3145/fix-space-loop-lord
Makes HE pipe min temp diff 0.01 instead of 20
2021-07-26 15:09:06 -05:00
Putnam3145
f8335f34f9 just removes the multi-surgery test for now. 2021-07-25 20:26:32 -07:00
Putnam3145
52d6828881 please. 2021-07-25 20:15:06 -07:00
Putnam3145
cbdcf4dfa5 we don't have tinker_nanites 2021-07-25 20:04:57 -07:00
Putnam3145
9a62fed735 /proc/ 2021-07-25 19:55:48 -07:00
Putnam3145
95d2adb996 a bunch of async and waitfor 2021-07-25 19:51:27 -07:00
Putnam3145
cd2a710a23 there's too many errors caused by these two 2021-07-25 19:36:23 -07:00
Putnam3145
bba0ba2c7c some more unit test fixes 2021-07-25 19:09:19 -07:00
Putnam3145
975582380b always search when you change paths 2021-07-25 18:52:01 -07:00
Putnam3145
ebb8d278a1 Runtime fix; need to update auxmos or it's lies 2021-07-25 18:45:17 -07:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
Lin
0066fc6755 Merge pull request #14959 from Citadel-Station-13/table-floodfills
rewrites subtler_around_table to be slightly cleaner and (probably) work?
2021-07-25 13:56:35 -07:00
SandPoot
ab039ecbfb Update vorepanel.dm 2021-07-23 18:16:07 -03:00
Lin
8105a3c692 Merge pull request #14960 from Putnam3145/hallucination-tweaks
Some hallucination tweaks
2021-07-23 11:41:03 -07:00
Artur
67de120624 Replaces a few more direct blood refillers 2021-07-23 18:58:42 +03:00
Artur
be1e9e4e04 deals with conflicts 2021-07-23 18:53:48 +03:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
Putnam3145
4b310cc354 Makes HE pipe min temp diff not so low 2021-07-22 20:12:00 -07:00
Putnam3145
cc2f7ec669 forgot to remove the hardcoded defines 2021-07-20 23:13:46 -07:00
Putnam3145
90bc48f579 Some hallucination tweaks 2021-07-20 22:49:08 -07:00
Putnam3145
0b55928f9b Makes supermatter properties auxgm-based 2021-07-20 22:46:33 -07:00
silicons
1044ea6ae9 Update say_vr.dm 2021-07-20 18:00:36 -07:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00
silicons
bb337b92dd Merge pull request #14946 from timothyteakettle/cow-tail
anthros can now select the cow tail
2021-07-18 15:07:36 -07:00
silicons
24c2ab8b8c Merge pull request #14940 from timothyteakettle/trash-eating
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
silicons
7847f6b69c Merge pull request #14916 from WanderingFox95/WanderingFox95-clearcatsurgeonannouncement
[Ready] Another Cat Surgeon Announcement PR? It's more likely than you think!
2021-07-18 15:06:48 -07:00
silicons
89d0c590e6 Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
Custom Kegs
2021-07-18 15:06:30 -07:00
silicons
5895eb0d31 Merge pull request #14926 from YakumoChen/human-leather-hats
Human leather hats
2021-07-18 15:06:22 -07:00
silicons
7cd89978f2 Merge pull request #14933 from keronshb/stripdcport
[PORT]  Stripping a disconnected player will tell them when they come back (+Lazynull)
2021-07-18 15:05:48 -07:00
silicons
9d741fc81c Merge pull request #14941 from SandPoot/vore
Vore additions/update
2021-07-18 15:05:33 -07:00
timothyteakettle
06ccaf702a bugfixes 2021-07-18 15:10:39 +01:00
timothyteakettle
f55d872376 Update _bodyparts.dm 2021-07-18 14:00:19 +01:00
timothyteakettle
4d1dad2e5b yes 2021-07-18 13:59:45 +01:00
SandPoot
b5b033e43e Update bellymodes.dm
oops
2021-07-16 15:07:11 -03:00
SandPoot
6445cfdd9d Removes spontaneous vore and reorganizes buttons 2021-07-15 17:32:03 -03:00
Timothy Teakettle
e9c7d61dc3 Update tails.dm 2021-07-15 19:13:56 +01:00
WanderingFox95
6ed0d699e9 keg code, far away from kegs
cause it's just a big barrel that doesn't ferment anything.
2021-07-15 01:50:01 +02:00
Putnam3145
cf3c600938 doy 2021-07-13 22:13:25 -07:00
Putnam3145
9d9b74276e Fixes a major source of lag 2021-07-13 22:07:26 -07:00