Commit Graph

26846 Commits

Author SHA1 Message Date
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
59f59178f4 does this work 2021-01-24 19:24:50 -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
6dcc3c5702 Merge pull request #14128 from MrJWhit/putting-old-garbage-in-the-bin
Port of "Update some oldcode"
2021-01-24 13:25:49 -06:00
Lin
04aaa7aeda Merge pull request #14129 from MrJWhit/cursed-name
Porting a cursed name about drinking
2021-01-24 13:24:19 -06:00
Lin
a983b70495 Merge pull request #14121 from MrJWhit/port-Makes-the-microwave-cleanable-by-the-damp-rag-
Port of "Makes the microwave cleanable by the damp rag"
2021-01-24 13:23:12 -06:00
Lin
3c32832105 Merge pull request #14125 from MrJWhit/encryption-key-port
Port of "Puts encryption keys in hand when removed"
2021-01-24 13:21:26 -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
Hatterhat
cbc19c7e91 depcards not in lockers 2021-01-23 19:37:39 -06:00
silicons
bc49224241 Update species.dm 2021-01-22 20:51:24 -07:00
MrJWhit
6dd674dae4 Porting 2021-01-22 20:47:45 -05:00
MrJWhit
c642f77c81 Weeeeeeee 2021-01-22 19:49:04 -05:00
Hatterhat
09d91643ef tg 56348 2021-01-22 18:39:46 -06: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
3e157c3aa8 Update headset.dm 2021-01-22 19:18:28 -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
MrJWhit
d9f2cccd84 Hehoo maybe I should actually see what happens when I compile 2021-01-22 13:33:18 -05:00
MrJWhit
5fe6772c58 Update microwave.dm 2021-01-22 13:23:10 -05:00
DeltaFire
920be8cffc stuffs 2021-01-22 01:43:35 +01:00
Timothy Teakettle
ca9292f6fd Update overmind.dm 2021-01-21 22:45:46 +00:00
Timothy Teakettle
897f8a744f Update overmind.dm 2021-01-21 22:39:38 +00:00
Timothy Teakettle
8569c40ce5 Update adminpm.dm 2021-01-21 22:23:48 +00:00
Timothy Teakettle
401e6a7690 test 2021-01-21 20:17:25 +00:00
silicons
f2853ab414 Merge pull request #14103 from Arturlang/give_hotkey
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
72716068ba Merge pull request #14101 from Hatterhat/more-gauze-shit
some other gauze parity dogshit
2021-01-20 15:26:41 -07:00
silicons
8cb8ddef42 Merge pull request #13969 from Arturlang/blood_bag_tweaks
Tweaks blood bag consumption
2021-01-20 15:26:12 -07:00
silicons
66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
2021-01-20 15:22:06 -07:00
silicons
2acdee8d01 Merge pull request #14076 from Hatterhat/cotton-stack-pull
pulling cotton (or durathread) while standing on a pile of cotton (or durathread) picks all of them
2021-01-20 15:21:44 -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
fa587e3d1a Merge pull request #14100 from Hatterhat/sheath-exp
twinsheath additions
2021-01-20 15:20:45 -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
f6a8306174 Merge pull request #14109 from Arturlang/space_tackling_meme_fix
Fixes the space tackling meme
2021-01-20 15:17:36 -07:00
silicons
f7c6dbd8ba Merge pull request #14110 from BlueWildrose/nicebobbertsonsyougotthere
Removes oversized genitalia analysis from medical scanners
2021-01-20 15:17:12 -07:00
silicons
5afe3bbb6f Merge remote-tracking branch 'citadel/master' into ex_act_3 2021-01-20 15:15:10 -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
silicons
f3cdaf941b Update colormate.dm 2021-01-20 15:11:04 -07:00
silicons
f6eca7afad hugboxy shit 2021-01-20 15:06:53 -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
Artur
41f4586f50 Forgot to undo some testing changes 2021-01-20 22:30:14 +02:00
Artur
4457d568dd Tank memes finished 2021-01-20 20:25:36 +02:00
Artur
87c9201707 No gunning sadly 2021-01-20 19:51:11 +02:00
Putnam3145
2debe930fc Merge pull request #14094 from kittycat2002/master
Gives /datum/reagent/consumable/ethanol/species_drink a name
2021-01-20 08:45:52 -08:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00