Commit Graph

8176 Commits

Author SHA1 Message Date
Arturlang a09df34420 Gas pump CTRL and Alt click function 2019-05-24 12:09:14 +03:00
Useroth c0cdc4c3ef Update weaponized.dm 2019-05-23 22:49:21 +02:00
deathride58 cf1acdf058 can my post-testing optimizations please at least work? 2019-05-23 13:12:31 -04:00
deathride58 4e989038e2 Fixes blob shields being completely invulnerable to all forms of damage after reaching a weakened state. 2019-05-23 12:37:46 -04:00
UntoldTactics 0cf0d4d8ed Update runes.dm 2019-05-23 18:37:17 +10:00
JTGSZ 196da05313 Brute deconv correct
woops
2019-05-23 02:49:35 -04:00
JTGSZ 9081b34cb8 blunt trauma deconv 2019-05-23 01:16:29 -04:00
Trilbyspaceclone fb6eca8d46 How did this even compile? 2019-05-22 21:28:16 -04:00
Trilbyspaceclone 717398213b Update pirates.dm 2019-05-22 18:52:15 -04:00
Trilbyspaceclone e0e0142fb1 Better grammar 2019-05-22 18:26:06 -04:00
Trilbyspaceclone 3168c956a9 *cough* 2019-05-22 15:46:57 -04:00
Trilbyspaceclone 6fbe698e32 I know what im doing, I sware 2019-05-22 15:45:47 -04:00
Trilbyspaceclone 90bc986b84 Bhijn's sanity 2019-05-22 15:33:50 -04:00
Trilbyspaceclone 80b44ac0f4 Update hardsuit.dm 2019-05-22 14:37:24 -04:00
Trilbyspaceclone 82ea741f57 Update packs.dm 2019-05-22 14:34:50 -04:00
kevinz000 b900815e90 Merge pull request #8400 from dtfe3/watcher-trophy
Watcher Wing Trophy Effect increase
2019-05-22 10:42:25 -07:00
Ghommie 4998b7cfa1 Actually, the cult team should process it instead.
Got you covered, badmins spawning cult on other modes.
2019-05-22 18:43:26 +02:00
Carlen White 1bddf2d5ae Added comment
For whoever comes across this code and wonders what am I doing.
2019-05-22 09:32:25 -04:00
Poojawa 25463f22b2 Fixes species getting genitals at all if NOGENITAL'd
Holy FUCK this code is bad.
2019-05-21 23:52:19 -05:00
Carlen White bb2a8bdd59 Fixes flavor text from being removed when canceled.
This was because canceling really just sent a empty string and not null which caused it to set the flavor text to an empty string.
2019-05-22 00:38:18 -04:00
Ghommie 6bb70297ec Why did you check if the gamemode's type is an antagonist datum?
And why did it sort of work too?
I don't understand.
Pooj's copypasting this black magic, smh.
2019-05-22 06:09:18 +02:00
Poojawa ae939c4344 Female Gendered markings 2019-05-21 22:51:00 -05:00
Carlen White e9c450bf17 Flavor text with special characters don't get partially unescaped
Copying the text that was escaped would occasionally trim an escaping character. Now it's decoded, copied, then encoded to prevent it.
2019-05-21 22:04:14 -04:00
CdrCross 82d308eb5e Defibrillator Upgrades Proofread
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
2019-05-21 23:37:28 +02:00
dtfe3 0085a69d31 Watcher Wing Trophy Effect increase 2019-05-21 18:12:42 +02:00
deathride58 4a17f192e8 Merge pull request #8201 from Citadel-Station-13/kevinz000-patch-19
Changes OD thresholds to match RP server and only trigger when you /exceed/ it per definition of threshold
2019-05-21 08:05:54 -04:00
deathride58 eb099ecbc4 Merge pull request #7704 from Citadel-Station-13/kevinz000-patch-6
Adds manual play internet sound for when youtube-dl is too out of date to play Rasputin automatically
2019-05-21 08:05:22 -04:00
deathride58 efe8d73372 Merge pull request #8269 from Citadel-Station-13/kevinz000-patch-39
adds variant of podpersons with 20% brute/burn heal and 70% toxheal and 75% nutrition/light factor of normal for roundstart pod species
2019-05-21 08:04:57 -04:00
deathride58 f3116baa08 Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37
Removes firing pins from preprinted gravity guns
2019-05-21 08:04:26 -04:00
kevinz000 dc548c06b5 Merge pull request #8293 from Useroth/ninja-adrenals
Adrenal implant, as well as ling and ninja adrenals buff (or rather, making them function like pre-rework (or even slightly better))
2019-05-20 23:40:52 -07:00
kevinz000 a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker
[Ready]Makes a blue space bike horn HONK
2019-05-20 23:40:17 -07:00
kevinz000 d5f2fc156c Merge pull request #8368 from Trilbyspaceclone/patch-128
Adds more clothing to venders
2019-05-20 23:36:42 -07:00
kevinz000 cccf1e1291 Merge pull request #8369 from Trilbyspaceclone/patch-129
Adds more shuttle curse texts
2019-05-20 23:36:25 -07:00
kevinz000 999bb87b4a Merge pull request #8378 from Useroth/nutcracker
Nutcracker. Yes, it's big enough to crush heads.
2019-05-20 23:35:33 -07:00
kevinz000 bcf78736ba Merge pull request #8385 from BlackMajor/Dunga
Adds a cream pie smite.
2019-05-20 23:32:27 -07:00
kevinz000 a6a1de2f2f Merge pull request #8386 from BlackMajor/Ooga
Ling hivemind no longer turns apostrophes into '
2019-05-20 23:30:48 -07:00
kevinz000 74af355079 Merge pull request #8392 from Poojawa/donator-item-fixing
Fixes Kiara's sabre belt icons, fixes armor offsets for taurs
2019-05-20 23:30:28 -07:00
kevinz000 bd54053e7a Merge pull request #8375 from Poojawa/signaller-improvements
Singallers are now input instead of button mashing
2019-05-20 23:30:04 -07:00
BurgerLua bcf563e132 Fixes ass slapping to be less annoying. 2019-05-20 21:53:47 -07:00
BlackMajor 80c88a8494 Shit he right 2019-05-21 15:16:51 +12:00
Carlen White 51f2a37e6e Changed arousal message styling.
Now with less gaudy green.
2019-05-20 17:47:10 -04:00
Trilbyspaceclone 539a965159 Update lavaland_ruin_code.dm 2019-05-20 15:33:46 -04:00
Trilbyspaceclone d59614a9bb Update cult_items.dm 2019-05-20 15:21:06 -04:00
kevinz000 626ede8464 Merge pull request #8367 from Poojawa/genital-improvements
[READY] Genital fixes and skintone sync [Adds erections[]
2019-05-19 22:47:01 -07:00
kevinz000 6c79587dad Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here!
Butt Slaps
2019-05-19 22:43:40 -07:00
kevinz000 1deb83949d Merge pull request #8374 from Poojawa/Heart-attacks
Heart Attacks will murder you now
2019-05-19 12:46:39 -07:00
kevinz000 8ceec4271e Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle
Simple Mob vore toggle works again
2019-05-19 12:46:13 -07:00
kevinz000 393d025465 Merge pull request #8382 from CalamaBanana/ear-Skintone-fix
Fixes color of elf ears, using skintone
2019-05-19 12:40:33 -07:00
Useroth 2ec5bc2db6 Because Travis is being a bitch right now. 2019-05-19 21:29:09 +02:00
Poojawa 5f358a5a75 Local sune fixes armor without having to do spritework 2019-05-18 23:42:29 -05:00