Commit Graph

  • f6f4c946e6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-05-22 00:08:13 -05:00
  • 25463f22b2 Fixes species getting genitals at all if NOGENITAL'd Poojawa 2019-05-21 23:52:19 -05:00
  • bb2a8bdd59 Fixes flavor text from being removed when canceled. Carlen White 2019-05-22 00:27:19 -04:00
  • 6f88ecb4de return Ghommie 2019-05-22 06:21:37 +02:00
  • 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. Ghommie 2019-05-22 06:09:18 +02:00
  • e3fa48c715 Fixes Slime and mammal legs to match Humans Poojawa 2019-05-21 23:01:33 -05:00
  • ae939c4344 Female Gendered markings Poojawa 2019-05-21 22:51:00 -05:00
  • 0d139a5549 Batch messages on checking yourself Carlen White 2019-05-21 23:03:06 -04:00
  • e9c450bf17 Flavor text with special characters don't get partially unescaped Carlen White 2019-05-21 22:04:14 -04:00
  • e86585935f MidFix - compile unsafe. Fermi 2019-05-22 02:25:05 +01:00
  • 8b950ae722 Revert "Delete tgstation.dme" CdrCross 2019-05-21 23:57:29 +02:00
  • d051ae173f Delete tgstation.dme CdrCross 2019-05-21 23:57:29 +02:00
  • b4a7bad2f8 Initial copypasta. Ghommie 2019-05-21 23:49:33 +02:00
  • 82d308eb5e Defibrillator Upgrades Proofread CdrCross 2019-05-21 23:37:28 +02:00
  • 2b668a8b7c activated = FALSE Ghommie 2019-05-21 23:12:23 +02:00
  • 485def8d28 More fixed upon the last! Fermi 2019-05-21 22:06:55 +01:00
  • ab9bde1b15 reverts Lily. Ghommie 2019-05-21 22:55:49 +02:00
  • 20124c24ec Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 Ghommie 2019-05-21 22:48:59 +02:00
  • 5e4bbb0d02 Awaken, code. Ghommie 2019-05-21 22:45:59 +02:00
  • 732bb6575b tweak footstep frequency nero1024 2019-05-21 14:49:15 -05:00
  • ac3f0c790e Fixed compling errors from last time. Fermi 2019-05-21 20:28:40 +01:00
  • be4f188589 FermiChem? More like, FermiFixes! Fermi 2019-05-21 20:08:46 +01:00
  • 84016ed3ef Here we go. JTGSZ 2019-05-21 12:30:44 -04:00
  • 0085a69d31 Watcher Wing Trophy Effect increase dtfe3 2019-05-21 18:12:42 +02:00
  • d40d9791c4 Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41 deathride58 2019-05-21 08:06:21 -04:00
  • 4a17f192e8 Merge pull request #8201 from Citadel-Station-13/kevinz000-patch-19 deathride58 2019-05-21 08:05:54 -04:00
  • eb099ecbc4 Merge pull request #7704 from Citadel-Station-13/kevinz000-patch-6 deathride58 2019-05-21 08:05:22 -04:00
  • efe8d73372 Merge pull request #8269 from Citadel-Station-13/kevinz000-patch-39 deathride58 2019-05-21 08:04:57 -04:00
  • f3116baa08 Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37 deathride58 2019-05-21 08:04:26 -04:00
  • ab2457d504 Large Maps given an Apothecary Poojawa 2019-05-21 06:09:10 -05:00
  • 55dca0bd41 Merge pull request #8139 from Trilbyspaceclone/patch-82 kevinz000 2019-05-21 00:00:28 -07:00
  • b2c873edc0 Merge pull request #8371 from Useroth/desword kevinz000 2019-05-20 23:56:10 -07:00
  • dc548c06b5 Merge pull request #8293 from Useroth/ninja-adrenals kevinz000 2019-05-20 23:40:52 -07:00
  • a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker kevinz000 2019-05-20 23:40:17 -07:00
  • 0f0ed91a62 Automatic changelog generation for PR #8370 [ci skip] CitadelStationBot 2019-05-21 01:36:58 -05:00
  • a949295022 Merge pull request #8370 from Trilbyspaceclone/patch-130 kevinz000 2019-05-20 23:36:56 -07:00
  • f568c727d0 Automatic changelog generation for PR #8368 [ci skip] CitadelStationBot 2019-05-21 01:36:44 -05:00
  • d5f2fc156c Merge pull request #8368 from Trilbyspaceclone/patch-128 kevinz000 2019-05-20 23:36:42 -07:00
  • 9109445613 Automatic changelog generation for PR #8369 [ci skip] CitadelStationBot 2019-05-21 01:36:27 -05:00
  • cccf1e1291 Merge pull request #8369 from Trilbyspaceclone/patch-129 kevinz000 2019-05-20 23:36:25 -07:00
  • 999bb87b4a Merge pull request #8378 from Useroth/nutcracker kevinz000 2019-05-20 23:35:33 -07:00
  • 54bef402bd Automatic changelog generation for PR #8393 [ci skip] CitadelStationBot 2019-05-21 01:34:40 -05:00
  • e941901165 Merge pull request #8393 from WhiteHusky/sleeper-blood-levels kevinz000 2019-05-20 23:34:38 -07:00
  • 43c1dd4aec Automatic changelog generation for PR #8366 [ci skip] CitadelStationBot 2019-05-21 01:33:30 -05:00
  • b5918080c0 Merge pull request #8366 from Poojawa/cryopod-mapping-fixes kevinz000 2019-05-20 23:33:28 -07:00
  • 3ae9661866 Merge pull request #8390 from CalamaBanana/station-charter-apostrophes kevinz000 2019-05-20 23:32:50 -07:00
  • bcf78736ba Merge pull request #8385 from BlackMajor/Dunga kevinz000 2019-05-20 23:32:27 -07:00
  • dff600f1e5 Merge pull request #8389 from CalamaBanana/vote-sound kevinz000 2019-05-20 23:31:56 -07:00
  • 2cb3ccbd80 Automatic changelog generation for PR #8376 [ci skip] CitadelStationBot 2019-05-21 01:31:40 -05:00
  • 733bb498ca Merge pull request #8376 from Poojawa/oracle-cloning kevinz000 2019-05-20 23:31:38 -07:00
  • a6a1de2f2f Merge pull request #8386 from BlackMajor/Ooga kevinz000 2019-05-20 23:30:48 -07:00
  • bd0aa164db Automatic changelog generation for PR #8392 [ci skip] CitadelStationBot 2019-05-21 01:30:30 -05:00
  • 74af355079 Merge pull request #8392 from Poojawa/donator-item-fixing kevinz000 2019-05-20 23:30:28 -07:00
  • bd54053e7a Merge pull request #8375 from Poojawa/signaller-improvements kevinz000 2019-05-20 23:30:04 -07:00
  • e77f30d803 Slight change for aphrodisiacs to use the new userlove style. Carlen White 2019-05-21 01:39:00 -04:00
  • bcf563e132 Fixes ass slapping to be less annoying. BurgerLua 2019-05-20 21:53:47 -07:00
  • 71088eace9 More fixes Fermi 2019-05-21 05:05:32 +01:00
  • 80c88a8494 Shit he right BlackMajor 2019-05-21 15:16:51 +12:00
  • a9bc75fc0e why do I even bother Fermi 2019-05-21 02:53:17 +01:00
  • ccef9c326a Sleepers now show blood level and type for occupants. Carlen White 2019-05-20 17:55:25 -04:00
  • 51f2a37e6e Changed arousal message styling. Carlen White 2019-05-20 17:47:10 -04:00
  • 539a965159 Update lavaland_ruin_code.dm Trilbyspaceclone 2019-05-20 15:33:46 -04:00
  • a68c40a1a0 Update lavaland_surface_seed_vault.dmm Trilbyspaceclone 2019-05-20 15:29:52 -04:00
  • d59614a9bb Update cult_items.dm Trilbyspaceclone 2019-05-20 15:21:06 -04:00
  • 773431bb8d So close..! Fermi 2019-05-20 07:46:31 +01:00
  • bb4aecbd5f Progressional fixes Fermi 2019-05-20 07:44:39 +01:00
  • ce2e980eb3 Automatic changelog generation for PR #8367 [ci skip] CitadelStationBot 2019-05-20 00:47:04 -05:00
  • 626ede8464 Merge pull request #8367 from Poojawa/genital-improvements kevinz000 2019-05-19 22:47:01 -07:00
  • 6c79587dad Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here! kevinz000 2019-05-19 22:43:40 -07:00
  • a6ede9fecc Endless fixes Fermi 2019-05-19 23:32:30 +01:00
  • 4290d05007 Automatic changelog generation for PR #8372 [ci skip] CitadelStationBot 2019-05-19 14:47:05 -05:00
  • d8579b2e2d Merge pull request #8372 from Poojawa/paws-of-life-needs-more-fixing kevinz000 2019-05-19 12:47:03 -07:00
  • 1ca2dc6ac9 Automatic changelog generation for PR #8374 [ci skip] CitadelStationBot 2019-05-19 14:46:41 -05:00
  • 1deb83949d Merge pull request #8374 from Poojawa/Heart-attacks kevinz000 2019-05-19 12:46:39 -07:00
  • 8ceec4271e Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle kevinz000 2019-05-19 12:46:13 -07:00
  • 393d025465 Merge pull request #8382 from CalamaBanana/ear-Skintone-fix kevinz000 2019-05-19 12:40:33 -07:00
  • 2ec5bc2db6 Because Travis is being a bitch right now. Useroth 2019-05-19 21:29:09 +02:00
  • 1d8e6a5631 Automatic changelog generation for PR #8377 [ci skip] CitadelStationBot 2019-05-19 13:14:27 -05:00
  • 426033ab9d Merge pull request #8377 from Poojawa/crusher-nerf deathride58 2019-05-19 14:14:25 -04:00
  • 45602f8a08 Merge pull request #8380 from Poojawa/pipe-fixes deathride58 2019-05-19 14:13:06 -04:00
  • 03f129fa6e More changes JTGSZ 2019-05-19 07:29:09 -04:00
  • 4bd4aa3f6d ohwait, this didn't get included Poojawa 2019-05-18 23:56:57 -05:00
  • 5f358a5a75 Local sune fixes armor without having to do spritework Poojawa 2019-05-18 23:42:29 -05:00
  • 072a4ce6a6 Sleepy fixes Fermi 2019-05-19 04:20:34 +01:00
  • 8130a10d3a Gosh darn fixes Fermi 2019-05-19 03:39:26 +01:00
  • 8dc5fccfa7 fixes darksabre stuff Poojawa 2019-05-18 21:14:19 -05:00
  • 791d021d50 Even more fixes. Fermi 2019-05-19 01:37:20 +01:00
  • a837eda98b More fixes. Fermi 2019-05-18 22:50:20 +01:00
  • a92abcbb96 It's always the more extreme stuff you don't notice. Moved the damage check AFTER the check whether the head exists to begin with. Useroth 2019-05-18 21:40:43 +02:00
  • 9ff2132055 Update lavaland_surface_seed_vault.dmm Trilbyspaceclone 2019-05-18 12:52:59 -04:00
  • 9f2b91b2e9 Apply suggestions from code review Trilbyspaceclone 2019-05-18 12:24:40 -04:00
  • 1c608ca910 Automatic changelog generation for PR #8388 [ci skip] CitadelStationBot 2019-05-18 10:30:12 -05:00
  • ed4c9506a7 Merge pull request #8388 from Useroth/collars-n-shit kevinz000 2019-05-18 08:30:10 -07:00
  • de841761b2 Charter apostrophes fixed, too CalamaBanana 2019-05-18 16:19:25 +02:00
  • 4b91eb89b4 Update vote.dm CalamaBanana 2019-05-18 16:05:38 +02:00
  • 5c4da48593 Plays a sound if a vote is started CalamaBanana 2019-05-18 16:03:59 +02:00
  • 8ea639a5ac Quick fix for the colorable collars. Useroth 2019-05-18 15:26:46 +02:00
  • 0364b87358 Merge pull request #1 from Citadel-Station-13/master CalamaBanana 2019-05-18 15:12:45 +02:00
  • 09dfb448ed woops JTGSZ 2019-05-18 05:51:53 -04:00
  • 6c077758c6 ports gang JTGSZ 2019-05-18 05:06:22 -04:00