912b09d33b
Merge pull request #14146 from zeroisthebiggay/ooffuck
...
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
2021-01-27 19:08:19 -07:00
f7c1cdc571
Merge pull request #14112 from silicons/ex_act_3
...
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
2021-01-27 17:16:44 -06:00
ee74f2c06c
here comes fetish content
2021-01-27 15:38:34 -05:00
ad2864f137
aeughfuck
2021-01-27 13:30:44 -05:00
a1e92e55aa
Merge pull request #14102 from Hatterhat/somatobuff-50513
...
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
de8d778f76
Merge pull request #14134 from Arturlang/Give_improvements
...
[READY]Give Improved
2021-01-25 23:02:03 -07:00
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
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
8176bf30ff
new line
2021-01-24 21:51:08 -08:00
e85379eea2
a
2021-01-24 21:36:04 -08:00
f2d9643c75
init
2021-01-24 22:31:39 -05:00
79640e912d
bread in french (who added living bread?)
2021-01-24 19:30:15 -05:00
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
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
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
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
91cd7378ca
Give Improved
2021-01-24 16:05:42 +02:00
bc49224241
Update species.dm
2021-01-22 20:51:24 -07:00
a78b6ae958
Update transform_procs.dm
2021-01-22 19:35:17 -05:00
8603a9fc77
Update ai.dm
2021-01-22 19:26:42 -05:00
01d6d40d8e
Port'n
2021-01-22 19:04:37 -05:00
399d04654a
Update alien.dm
2021-01-22 18:57:31 -05:00
fb75c6a949
adds in ending sequence for Ratvar spawning, + various other changes
...
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
2021-01-22 00:04:04 -05:00
f2853ab414
Merge pull request #14103 from Arturlang/give_hotkey
...
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
34473c2ac7
fix
2021-01-20 16:55:19 -07:00
996ad0634d
fix
2021-01-20 16:16:06 -07:00
20f06cae0f
fix
2021-01-20 16:07:42 -07:00
235ca8809a
uh
2021-01-20 16:04:52 -07:00
e06f0bbc72
fixes
2021-01-20 16:01:09 -07:00
718cb3f501
Merge pull request #14092 from BlueWildrose/Timidwomen
...
Adds Timid wo/man costumes
2021-01-20 15:21:06 -07:00
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
5afe3bbb6f
Merge remote-tracking branch 'citadel/master' into ex_act_3
2021-01-20 15:15:10 -07:00
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
f6eca7afad
hugboxy shit
2021-01-20 15:06:53 -07:00
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
125cd17cee
Merge remote-tracking branch 'origin/master' into rustsql
2021-01-20 15:40:41 +08:00
81e37b6e33
Update robot_modules.dm
2021-01-19 21:40:47 -08:00
6547028272
what the fuck??
2021-01-20 11:56:44 +08:00
9fa6958a99
OH FUCK
2021-01-20 11:49:53 +08:00
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
745c825205
Give hotkey, but citadel
2021-01-20 04:21:57 +02:00
e006587f4b
today i will not test my code
2021-01-19 17:24:33 -06:00
83566cdbe3
Update parrot.dm
2021-01-19 05:23:43 -07:00
dedb0cb62e
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-19 04:24:42 -07:00
e514db4bbb
Update species.dm
2021-01-19 03:33:31 -07:00
bdab7c2f4b
Update species.dm
2021-01-19 03:30:18 -07:00
88c21942d0
Merge branch 'master' into Timidwomen
2021-01-18 14:42:52 -07:00
c79177ab07
Adds Timid wo/man outfits
2021-01-18 13:42:38 -07:00
58dde0f60e
Merge pull request #14045 from Citadel-Station-13/silicons-patch-9
...
gorilla pais
2021-01-18 13:22:51 -06:00
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