BlackMajor
7733d3f98a
Update robot_modules.dm
2020-01-24 00:42:41 +13:00
Artur
0091da8307
Linter fixes
2020-01-23 11:31:41 +02:00
Artur
19fcd89282
Shit
2020-01-23 11:31:41 +02:00
Seris02
934c8fe533
updates + thingamajig
2020-01-23 15:25:45 +08:00
TrilbySpaceClone
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
Ghom and GitHub
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
Artur
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
Trilbyspaceclone and GitHub
ebb6ac1d7b
more words
2020-01-22 11:33:39 -05:00
Trilbyspaceclone and GitHub
bc1500c04c
Update cleanbot.dm
2020-01-21 18:33:04 -05:00
kevinz000
b5ca546ac3
patch
2020-01-20 22:45:21 -07:00
Seris02
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
Seris02
c2bcbe868e
merge conflicts + getting rid of commented code for now
2020-01-21 11:23:33 +08:00
Ghom and GitHub
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
Ghom and GitHub
038f5e4b0e
Yea, sorry for being so naive right now.
2020-01-20 21:59:12 +01:00
Ghom and GitHub
a921b27c63
I want a different maintainer to merge this now.
2020-01-20 21:58:21 +01:00
Ghommie
9604b27482
github web editor is so bad
2020-01-20 21:55:02 +01:00
Ghom and GitHub
5500e349e3
Merge branch 'master' into kevinz000-patch-10
2020-01-20 21:48:28 +01:00
Ghom and GitHub
9ea6e896fb
Kevinz, please.
2020-01-20 21:43:00 +01:00
Ghommie
5644617786
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450
2020-01-20 20:59:38 +01:00
Artur
f5ad854c2c
Conflict fix
2020-01-20 13:50:52 +02:00
Seris02
a100f9382e
better, there, happy now github
2020-01-20 14:51:53 +08:00
kevinz000 and GitHub
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
Ghommie
072eca6ec0
fixes and more PRs
2020-01-18 23:01:00 +01:00
Seris02
fdf3871cb7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-18 18:30:51 +08:00
Seris02
04b34ec8ed
hijack implant
2020-01-18 18:04:31 +08:00
Putnam
a8569fa7e5
Makes it so that opting out of ass slapping is OPT OUT
2020-01-17 21:31:23 -08:00
Ghommie
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
Ghommie
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
kevinz000 and GitHub
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
Ghom and GitHub
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
kevinz000 and GitHub
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
Putnam
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
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
kevinz000
97ded4b27b
ok
2020-01-14 18:09:12 -07:00
kevinz000
6ead30eab3
more shit
2020-01-14 17:22:54 -07:00
kevinz000
eff86a449f
wew
2020-01-14 16:45:22 -07:00
Ghommie
a0f35f5cfc
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-14 00:55:28 +01:00
Ghommie
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
Ghom and GitHub
984c43116c
Merge pull request #10539 from Savotta/cum
...
ports hShark snout from hyper-station-13
2020-01-13 16:07:28 +01:00
Putnam
e412852c8f
Made temp flavor "more" pop up with actual temp flavor
2020-01-12 23:44:49 -08:00
deathride58 and GitHub
bbdedd20b6
Merge branch 'master' into stambufferbuff
2020-01-12 20:35:31 -05:00
Ghommie
f45f979c27
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
2020-01-12 23:21:03 +01:00
Ghommie
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
Ghommie
02fbbd4f95
Ouch.
2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000 and GitHub
0b56e76b29
Merge pull request #10504 from Xantholne/xantholne-bees02
...
Bees
2020-01-12 00:42:19 -08:00
kevinz000 and GitHub
6396c95bec
Merge pull request #10480 from Putnam3145/more_flavor
...
Added second flavor text, not copied anywhere.
2020-01-12 00:41:47 -08:00
kevinz000 and GitHub
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
Savotta
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
BlackMajor
30fc5b560b
Couple of lingering fixes
2020-01-11 17:57:18 +13:00
BlackMajor