Commit Graph

5975 Commits

Author SHA1 Message Date
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
silicons 86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
Lin fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
raspy-on-osu a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu 3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
silicons 055b1a1db8 Merge pull request #14183 from timothyteakettle/by-armok-by-beard
dwarf facial hair is no longer randomised
2021-02-04 12:56:01 -07:00
silicons 993a849700 Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
2021-02-04 12:49:09 -07:00
TyrianTyrell f009249f7e Update say.dm 2021-02-01 09:38:38 -05:00
TyrianTyrell 3e9f14526d Typofix 2021-02-01 09:35:24 -05:00
TyrianTyrell 643c4cf368 Update say.dm 2021-02-01 09:31:57 -05:00
TyrianTyrell 46e64d4dd3 Update say.dm 2021-02-01 09:15:43 -05:00
TyrianTyrell ff8c8f12d9 Moving a thing 2021-02-01 09:14:44 -05:00
TyrianTyrell 66cc55af3e Update say.dm 2021-02-01 09:08:23 -05:00
Lin 0dd82df64b Merge pull request #14113 from silicons/piggybacking
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
2021-01-31 23:33:59 -06:00
timothyteakettle 276dfee0d8 Update dwarves.dm 2021-02-01 01:29:37 +00:00
TyrianTyrell 9acdad29c5 Update say.dm 2021-01-31 14:33:33 -05:00
Hatterhat 4525b1b64f ooOOooOO today i wont test my code again 2021-01-29 20:19:58 -06:00
silicons c554f0567e Update human.dm 2021-01-29 11:57:28 -07:00
raspy-on-osu 8077d72edd more efficient 2021-01-28 18:47:02 -05:00
raspy-on-osu fe499636c3 init 2021-01-28 18:42:45 -05:00
zerothebigboy 0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
SmArtKar a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00
silicons fa2754c0fe Update human.dm 2021-01-27 20:49:56 -07:00
silicons 1c99225fbd Update human.dm 2021-01-27 20:48:07 -07:00
silicons a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
2021-01-27 19:08:25 -07:00
silicons 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
Lin 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
zerothebigboy ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
zerothebigboy ad2864f137 aeughfuck 2021-01-27 13:30:44 -05:00
silicons a1e92e55aa Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
2021-01-25 23:17:29 -07:00
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
Dan-Neposh 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
silicons 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