Commit Graph
5826 Commits
Author SHA1 Message Date
MrJWhit 01d6d40d8e Port'n 2021-01-22 19:04:37 -05:00
MrJWhit 399d04654a Update alien.dm 2021-01-22 18:57:31 -05:00
siliconsandGitHub f2853ab414 Merge pull request #14103 from Arturlang/give_hotkey
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
silicons 34473c2ac7 fix 2021-01-20 16:55:19 -07:00
silicons 996ad0634d fix 2021-01-20 16:16:06 -07:00
silicons 20f06cae0f fix 2021-01-20 16:07:42 -07:00
silicons 235ca8809a uh 2021-01-20 16:04:52 -07:00
silicons e06f0bbc72 fixes 2021-01-20 16:01:09 -07:00
siliconsandGitHub 718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
2021-01-20 15:21:06 -07:00
siliconsandGitHub 288bbcd334 Merge pull request #14107 from shellspeed1/Brings-back-mining-point-card-for-borgs
Mining borgs get a point ID again.
2021-01-20 15:17:47 -07:00
silicons 5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 2021-01-20 15:15:10 -07:00
siliconsandGitHub 9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync
[s] semi sync- we forgot the anti ddos thing
2021-01-20 15:14:37 -07:00
silicons f6eca7afad hugboxy shit 2021-01-20 15:06:53 -07:00
LinandGitHub d262f366e7 Merge pull request #14097 from Citadel-Station-13/silicons-patch-28
i'm not sure why cargo's bird crate has every bird spawn with a headset but let's not have that
2021-01-20 15:20:50 -06:00
shellspeed1 81e37b6e33 Update robot_modules.dm 2021-01-19 21:40:47 -08:00
Letter N 6547028272 what the fuck?? 2021-01-20 11:56:44 +08:00
Letter N 9fa6958a99 OH FUCK 2021-01-20 11:49:53 +08:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Artur 745c825205 Give hotkey, but citadel 2021-01-20 04:21:57 +02:00
Hatterhat e006587f4b today i will not test my code 2021-01-19 17:24:33 -06:00
siliconsandGitHub 83566cdbe3 Update parrot.dm 2021-01-19 05:23:43 -07:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
siliconsandGitHub e514db4bbb Update species.dm 2021-01-19 03:33:31 -07:00
siliconsandGitHub bdab7c2f4b Update species.dm 2021-01-19 03:30:18 -07:00
Blue Wildrose 88c21942d0 Merge branch 'master' into Timidwomen 2021-01-18 14:42:52 -07:00
Blue Wildrose c79177ab07 Adds Timid wo/man outfits 2021-01-18 13:42:38 -07:00
LinandGitHub 58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9
gorilla pais
2021-01-18 13:22:51 -06:00
Putnam3145andGitHub 51fc5ae235 Merge pull request #14053 from Citadel-Station-13/silicons-patch-13
"Make it so you can squeeze someone's hand when you hold it"
2021-01-18 10:17:56 -08:00
silicons 30b1cd82f9 . 2021-01-17 12:02:12 -07:00
siliconsandGitHub 5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -07:00
Hatterhat 5e6ace2668 bruh 2021-01-14 20:49:46 -06:00
siliconsandGitHub a9b3e6a514 Update carbon_defense.dm 2021-01-14 04:33:15 -07:00
siliconsandGitHub 05fcd10506 Update carbon_defense.dm 2021-01-13 22:46:01 -07:00
siliconsandGitHub 1188431bcb Update carbon_defense.dm 2021-01-13 22:40:13 -07:00
silicons ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
siliconsandGitHub 82cc5da8df Merge pull request #14034 from DeltaFire15/blindness-edgecase-fix
Fixes some edge cases regarding system corruption
2021-01-13 16:53:17 -07:00
siliconsandGitHub 310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
siliconsandGitHub f7cadc3293 Merge pull request #14009 from shellspeed1/wing-stuff
Ports a bunch of wings from cit RP and fulpstation [Ready]
2021-01-13 16:47:34 -07:00
silicons ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
siliconsandGitHub 33ca6c34a1 Update pai.dm 2021-01-13 14:48:59 -07:00
LinandGitHub 04c5d34cb6 Merge pull request #14015 from DeltaFire15/synth-stuffs
Tweaks some Synth damage stuff
2021-01-13 18:40:03 +00:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
DeltaFire c9e735b6b4 edge cases 2021-01-12 21:18:33 +01:00
DeltaFire 2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
shellspeed1 58426beadc readds missing none wings for insects 2021-01-09 16:15:50 -08:00
shellspeed1 679f097e27 resets names 2021-01-09 15:39:50 -08:00
silicons 2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons 9733305997 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-09 14:56:32 -08:00
silicons e680d58a03 fixes 2021-01-09 14:56:29 -08:00
DeltaFire bc29b80c94 :lazy: 2021-01-09 22:46:40 +01:00