shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,065 Commits 5 Branches 0 Tags
d22cac4a7a6ee8986bfee9aa69b05dba9f701a12
Commit Graph

28666 Commits

Author SHA1 Message Date
Putnam3145
d22cac4a7a Makes rod of asclepius usable for revival surgery 2021-08-03 17:51:32 -07:00
Putnam3145
d046357418 Merge pull request #14951 from timothyteakettle/leg-split 
[TESTMERGE FIRST HOLY SHIT FUCK] fixes every single leg sprite in the entire game
 2021-08-03 13:10:06 -07:00
Lin
d6b4b3b1f4 Merge pull request #14977 from BlueWildrose/hollowedhead 
Fixes brainless sprite being an error sprite
 2021-08-03 12:15:43 -05:00
silicons
2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit 
[READY] tempgun rebalance (it's not a nerf don't worry)
 2021-08-02 17:11:20 -07:00
BlueWildrose
0735ec66b3 Fixes brainless sprite being an error sprite 2021-08-01 06:33:08 -07:00
Putnam3145
9ed9fbcc73 Merge pull request #14973 from TripleShades/pubbyyyy 
[FAST MERGE] Pubby Deco Fix
 2021-07-31 21:25:40 -07:00
TripleShades
dfff5339c9 Update water.dm 2021-07-31 00:23:09 -04:00
TripleShades
652ffe22a2 Update water.dm 2021-07-30 23:58:11 -04:00
TripleShades
7d7525825d deco waterrrr 2021-07-30 23:51:57 -04:00
silicons
c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland 
[Review/Testmerge] Icemoon Ruins but on Lavaland!
 2021-07-29 22:39:42 -07: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
Lin
560dc048cf Merge pull request #14954 from Putnam3145/poor-fastmos 
Poor man's fastmos: just do diffusion faster 4head (+ auxmos update)
 2021-07-26 15:09:43 -05: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
23bf72c29f stop doing this. 2021-07-25 19:18:33 -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
Putnam3145
765dea059c added bee's paranoid auxmos function 
cause it's necessary
 2021-07-25 18:08:40 -07:00
Putnam3145
664c2a0a83 better erroring when auxtools not found 2021-07-25 17:10:07 -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
Putnam3145
4b310cc354 Makes HE pipe min temp diff not so low 2021-07-22 20:12:00 -07:00
Lin
01ed21bb92 Merge pull request #14874 from Citadel-Station-13/silicons-patch-41 
slight baton powercreep tweak (5 --> 3.5 seconds rmb cooldown, 35 --> 40 damage)
 2021-07-22 00:53:53 -07:00
silicons
224fb7f22c Update tables_racks.dm 2021-07-21 21:34:10 -07:00
silicons
d38a775a16 Update tables_racks.dm 2021-07-21 21:33:46 -07:00
Putnam3145
90bc48f579 Some hallucination tweaks 2021-07-20 22:49:08 -07:00
silicons
16622ac95a Update tables_racks.dm 2021-07-20 18:06:49 -07:00
silicons
1044ea6ae9 Update say_vr.dm 2021-07-20 18:00:36 -07:00
Putnam3145
f6de147ece Auxmos update + speed tweaks 2021-07-18 18:11:13 -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
b0c53fcc57 Merge pull request #14947 from Arturlang/crafting_fixes 
Crafting menu cleaning up
 2021-07-18 15:07:12 -07:00
silicons
91cdc7c13f Merge pull request #14949 from MrJWhit/oom-fix-port 
Port of "[s] Fixes a major memory leak in shuttle code (KILO IS FREE)"
 2021-07-18 15:07:01 -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
093df245b3 Merge pull request #14930 from keronshb/mirroromenport 
Ports Breaking a mirror now gives you a bad omen
 2021-07-18 15:06:03 -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
silicons
d9b70b1f1c woo 2021-07-18 15:04:30 -07:00
silicons
0df58c878e more 2021-07-18 14:01:43 -07:00