Commit Graph

5730 Commits

Author SHA1 Message Date
silicons
de8d778f76 Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
2021-01-25 23:02:03 -07:00
silicons
36215c5d48 Merge pull request #14136 from shellspeed1/Fixes-infinite-floor-tiles
Ports a fix for infinite floor tiles from tg caused by a bug that was fixed a long time ago on tg code.
2021-01-25 23:01:23 -07:00
silicons
8e20e20184 Merge pull request #14059 from Hatterhat/no-corpse-headsets
removes headsets and flashes from more legion corpses
2021-01-25 22:58:05 -07:00
shellspeed1
8176bf30ff new line 2021-01-24 21:51:08 -08:00
shellspeed1
e85379eea2 a 2021-01-24 21:36:04 -08:00
raspy-on-osu
f2d9643c75 init 2021-01-24 22:31:39 -05:00
raspy-on-osu
79640e912d bread in french (who added living bread?) 2021-01-24 19:30:15 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Lin
0759189ef5 Merge pull request #14124 from MrJWhit/port-AI-can-now-look-up-and-down-zlevels-
Port of "AI can now look up and down zlevels"
2021-01-24 13:30:42 -06:00
Lin
724450822f Merge pull request #14123 from MrJWhit/port-of-Let-Me-Tell-You-A-Story-
Port "Let Me Tell You A Story"
2021-01-24 13:20:03 -06:00
Lin
aa8640431c Merge pull request #14126 from MrJWhit/porting-Humanizing-a-monkey-no-longer-yeets-any-buried-smuggler's-satchels-from-the-tile-onto-their-person.-
Port "Humanizing a monkey no longer yeets any buried smuggler's satchels from the tile onto their person."
2021-01-24 13:19:42 -06:00
Artur
91cd7378ca Give Improved 2021-01-24 16:05:42 +02:00
silicons
bc49224241 Update species.dm 2021-01-22 20:51:24 -07:00
MrJWhit
a78b6ae958 Update transform_procs.dm 2021-01-22 19:35:17 -05:00
MrJWhit
8603a9fc77 Update ai.dm 2021-01-22 19:26:42 -05:00
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
silicons
f2853ab414 Merge pull request #14103 from Arturlang/give_hotkey
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
silicons
718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
2021-01-20 15:21:06 -07:00
silicons
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
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
Lin
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
silicons
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
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
Lin
58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9
gorilla pais
2021-01-18 13:22:51 -06:00
Putnam3145
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
silicons
5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -07:00
Hatterhat
5e6ace2668 bruh 2021-01-14 20:49:46 -06:00
silicons
a9b3e6a514 Update carbon_defense.dm 2021-01-14 04:33:15 -07:00
silicons
05fcd10506 Update carbon_defense.dm 2021-01-13 22:46:01 -07:00
silicons
1188431bcb Update carbon_defense.dm 2021-01-13 22:40:13 -07:00
silicons
ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
silicons
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
silicons
310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
silicons
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
silicons
33ca6c34a1 Update pai.dm 2021-01-13 14:48:59 -07:00
Lin
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