Commit Graph

11665 Commits

Author SHA1 Message Date
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
Lin
d6b28c59d4 Merge pull request #10509 from Ghommie/Ghommie-cit502
Fixes reagent containers examine.
2020-01-11 22:16:27 +00:00
kevinz000
af562d1421 Update bloodsucker_life.dm 2020-01-11 06:54:29 -08:00
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
Ghom
7fa3289013 Merge pull request #10497 from Trilbyspaceclone/uplink_redo
Cleans up uplink_items into each folder
2020-01-11 15:28:04 +01:00
Ghom
894abc67c0 Merge pull request #10502 from Linzolle/big-boss
[s] i'm trying to sneak around
2020-01-11 15:24:21 +01:00
Ghom
3a72d1f434 Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12
allow guests to use looc
2020-01-11 15:09:37 +01:00
Ghom
e851939281 Merge pull request #10523 from Hatterhat/fuck-you-baltimore
you can finally put armor plating on your standard explorer suit hood again
2020-01-11 15:06:20 +01:00
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06:00
Lin
42263a435a Merge pull request #10489 from Seris02/chameleonthing
Fixes and improvements for chameleon clothes
2020-01-11 01:12:43 +00:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
Lin
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
kevinz000
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
Ghommie
c9375a1288 Fixes reagent containers examination. 2020-01-10 14:19:22 +01:00
Linzolle
dc0fdebc21 hrmngh colonel 2020-01-09 22:46:43 -06:00
Linzolle
8d70181ecf uh oh stinky 2020-01-09 22:41:50 -06:00
Lin
e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
Lin
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
Ghommie
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
Lin
ee5d6a3d4a Merge pull request #10449 from Ghommie/Ghommie-cit498
Improves the set_APTFT verb into a proc.
2020-01-10 00:38:06 +00:00
Trilbyspaceclone
05d86b7072 Update uplink_items.dm 2020-01-09 16:03:27 -05:00
Trilbyspaceclone
9ba5f35398 Update uplink_items.dm 2020-01-09 16:02:53 -05:00
TrilbySpaceClone
74d881388e so much cleaner 2020-01-09 15:42:09 -05:00
Unknown
753c572a5e I'm about to go into a comma 2020-01-09 11:21:00 -07:00
kevinz000
dfce4ea75f Update looc.dm 2020-01-09 09:30:49 -08:00
Seris02
3f7a0f4b7c fixes chameleon cloak icon 2020-01-09 15:07:43 +08:00
Seris02
adfb077a0a chameleon fixes 2020-01-09 15:05:46 +08:00
Unknown
62396bffb1 Clothesmate vending 2020-01-08 22:47:28 -07:00
Unknown
8a8d0bf6da Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:36:22 -07:00
Unknown
afc0ca44f2 Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:35:36 -07:00
deathride58
0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
Seris02
c7790aba1a moves observe to ghost tab 2020-01-09 10:46:18 +08:00
Ghom
dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00
Putnam
df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
kappa-sama
f69c67cf5c tabs 2020-01-08 17:03:48 -05:00
kappa-sama
ceea7cd021 moves these over too 2020-01-08 16:47:22 -05:00
kappa-sama
38015d0d02 moves this 2020-01-08 16:45:52 -05:00
kappa-sama
341e076d40 refill 2 2020-01-08 16:43:47 -05:00
kappa-sama
18b78e7671 refill 2020-01-08 16:43:33 -05:00
kappa-sama
ebf8d048fd perhaps? 2020-01-08 16:42:16 -05:00
kappa-sama
c88f58bb67 hm 2020-01-08 16:41:44 -05:00
kevinz000
6a350d5d58 Merge pull request #10442 from Trilbyspaceclone/patch-264
Halfs the nutriments in sugar
2020-01-08 13:40:39 -08:00
kevinz000
2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
kevinz000
5f03f5e3d8 Merge pull request #10457 from r4d6/Voice-Copy
Add a playback device and make the Voice Analyzer actually care about languages.
2020-01-08 13:33:54 -08:00
kevinz000
1e6d05dc59 Merge pull request #10470 from deathride58/deletesminers
[s] adds a cooldown to area creation attempts
2020-01-08 13:29:36 -08:00
Arturlang
cc174d91ec Reviewer suggestion
Co-Authored-By: Lin <linzolle@gmail.com>
2020-01-08 22:02:50 +02:00
Artur
e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01:00
Artur
039248dac7 Kills legion core healing 2020-01-08 20:29:30 +01:00
kappa-sama
933916a386 e 2020-01-08 09:46:58 -05:00
Unknown
4773a3e374 Fuggin Cowboy Clothes 2020-01-08 07:15:42 -07:00