856ef236f3
Further runtime fixes by AnturK.
2020-01-24 23:01:30 +01:00
f5d8e447eb
Merge pull request #10676 from Kraseo/virgohairs
...
Reorganises/fixes virgo hairs
2020-01-24 16:39:10 +01:00
831ac91917
Merge pull request #10073 from Ghommie/Ghommie-cit435
...
Ports timestop and sepia extracts improvements/tweaks.
2020-01-24 00:25:53 -07:00
78934c52fe
A handful of runtime fixes.
2020-01-24 02:27:06 +01:00
14b7711590
i will end whoever ported virgo hairs and thought it was fine to do it like that
2020-01-23 17:29:21 +01:00
77e7dff11b
Webedit PR man bad
2020-01-24 01:41:40 +13:00
5fb2e60ebf
Merge branch 'master' into master
2020-01-24 00:50:46 +13:00
7733d3f98a
Update robot_modules.dm
2020-01-24 00:42:41 +13:00
86ea13afeb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270
2020-01-22 23:00:54 -05:00
bf62563507
Merge pull request #10410 from CameronWoof/free-the-lizard
...
Humans and anthromorphs can now use lizard tails.
2020-01-23 03:06:52 +01:00
ebb6ac1d7b
more words
2020-01-22 11:33:39 -05:00
bc1500c04c
Update cleanbot.dm
2020-01-21 18:33:04 -05:00
7a3f0d140c
Merge pull request #10468 from Citadel-Station-13/stop-ghosting
...
ghosting no longer makes it so you don't count for abductors
2020-01-21 02:26:25 +01:00
65eaf9787a
Merge pull request #10097 from Ghommie/Ghommie-cit444
...
Made traitor kevlar/armor padding accessories examine-proof.
2020-01-19 16:58:27 -07:00
072eca6ec0
fixes and more PRs
2020-01-18 23:01:00 +01:00
224146ee1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444
2020-01-18 03:36:09 +01:00
9c0b78bc09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-18 01:23:08 +01:00
aea0de30d1
Merge pull request #10125 from Ghommie/Ghommie-cit449
...
Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
e7b925e779
Merge pull request #10582 from Putnam3145/more_flavor
...
Made temp flavor "more" pop up with actual temp flavor
2020-01-17 14:44:04 +01:00
d110d7bae9
Merge pull request #10347 from deathride58/stambufferbuff
...
[experimental] Buffs the stamina buffer by making it recharge for free.
2020-01-16 14:51:38 -07:00
d29603ad77
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-15 15:57:32 -08:00
a0f35f5cfc
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-14 00:55:28 +01:00
1d948907f6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-13 23:26:21 +01:00
984c43116c
Merge pull request #10539 from Savotta/cum
...
ports hShark snout from hyper-station-13
2020-01-13 16:07:28 +01:00
e412852c8f
Made temp flavor "more" pop up with actual temp flavor
2020-01-12 23:44:49 -08:00
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -05:00
f45f979c27
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-12 23:21:03 +01:00
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
0b56e76b29
Merge pull request #10504 from Xantholne/xantholne-bees02
...
Bees
2020-01-12 00:42:19 -08:00
6396c95bec
Merge pull request #10480 from Putnam3145/more_flavor
...
Added second flavor text, not copied anywhere.
2020-01-12 00:41:47 -08:00
c69d882943
Merge pull request #10521 from BlackMajor/master
...
Fixes roundstart borg spawns, plus a little bit extra.
2020-01-12 00:40:48 -08:00
b265959f2a
ports hShark snout from hyper-station-13
...
you people wouldn't know intelligent writing if it kicked you in the fucking nuts, you drooling retarded apes. i'm so FUCKIGN pissed. you are so fucking retarded, it's insane. i am stuck in a world filled with retards, and am being exiled from it for being the only shred of intelligent life found upon it. i just want somebody to listen to what the FUCK i have to say. nobody here is interested in intelligent discussion about topics that actually matter, they're only interested in erping with each other. disgusting fucking creatures. these people infuriate me to no end. why does nobody want to have a discussion? why does nobody want to talk about fuckign SHIT. THE ONLY TIME ANYONE EVER TALKSTO ME IS WHEN THEY WANT TO FUCKING ERP WITH ME!!! WHAT'S WRONG WITH YOU FUCKING PEOPLE. I'VE HAD THE SAME FUCKNG GUY PDA MESSAGE ME EVERY DAY, ACTING ALL NICE AND SHIT, AND I KNOW IT'S JUST BECAUSE HE WANTS TO ERP!! THAT'S ALL ANY OF YOU PEOPLE FUCKING WANT. I'M TRYING TO HAVE SUBSTANCE-FILLED FUCKING CONVERSATION, AND ANALYZE MY FAVORITE SOUNDTRACK IN ALL OF GAMING HISTORY, AND YOU PEOPLE CAN'T GET YOUR HEADS OUT OF YOUR ASSES FOR 5 FUCKING SECONDS TO HOLD ANY MODICUM OF FUCKING RESPECT OR APPRECIATION FOR IT WHATSOEVER. FUCK YOU ALL. FUCK YOU. FUCK YOU.
2020-01-12 04:23:08 +01:00
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
29b66db9e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport
2020-01-11 11:29:30 +08:00
0b0b80f174
explosions
2020-01-11 11:22:59 +08:00
48fadffbfb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-10 17:57:03 -08:00
cd8e83e7c0
Merge pull request #10486 from Seris02/observe
...
moves observe to ghost tab instead of sticking it in the ooc tab
2020-01-10 23:56:46 +00:00
8f60099595
Merge pull request #10488 from Xantholne/xantholne-cowboy02
...
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
e5e2e4f012
Merge pull request #10329 from Ghommie/Ghommie-cit490
...
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
c4cb06f8f0
Merge pull request #10112 from Ghommie/Ghommie-cit447
...
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
825b4f01c2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-10 02:26:19 +01:00
e008388176
Bee models
2020-01-09 16:13:23 -07:00
8a8d0bf6da
Merge branch 'master' into xantholne-cowboy02
2020-01-08 20:36:22 -07:00
afc0ca44f2
Merge branch 'master' into xantholne-cowboy02
2020-01-08 20:35:36 -07:00
c7790aba1a
moves observe to ghost tab
2020-01-09 10:46:18 +08:00
244d46ee41
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
2020-01-08 17:08:01 -08:00
1e6d05dc59
Merge pull request #10470 from deathride58/deletesminers
...
[s] adds a cooldown to area creation attempts
2020-01-08 13:29:36 -08:00
4773a3e374
Fuggin Cowboy Clothes
2020-01-08 07:15:42 -07:00
Ghommie