Commit Graph

948 Commits

Author SHA1 Message Date
BlackMajor
98cecb2cc7 Merge pull request #8923 from Citadel-Station-13/kevinz000-patch-53
Removes damage from *dab
2019-08-06 21:47:52 +12:00
BlackMajor
d8d6fda259 Merge pull request #9050 from Ghommie/Ghommie-cit179
Fixes combatmode pushing not knocking people down against walls.
2019-08-06 21:28:29 +12:00
kevinz000
eab07c62de Merge pull request #9045 from CameronWoof/codifying-mrp-again
Officially ends the non-stop thrill ride of coating the station in your gender fluids for "fun"
2019-08-05 14:57:54 -07:00
CameronWoof
d09fa0d8a0 fix for smoke and odysseus exploits 2019-08-05 07:48:27 -07:00
kevinz000
b292bc7187 Merge pull request #9007 from Ghommie/Ghommie-cit168
Fixes and standarizes sword sheaths/scabbards overlays.
2019-08-05 00:49:49 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
2019-08-04 22:41:49 -07:00
Ghommie
cf81a57efa Adds in turf density checks, replaced object density checks with CanPass() 2019-08-05 05:33:47 +02:00
kevinz000
489b4c78dc Merge pull request #8996 from Ghommie/Ghommie-cit166
Adds in worn overlays for different types of cuffs.
2019-08-04 19:19:19 -07:00
kevinz000
de675a10e7 Merge pull request #9025 from Poojawa/patch-1
Actually fixes Vore sounds for real this time
2019-08-04 19:08:16 -07:00
CameronWoof
6f02c5c6f6 don't pre-fill the tank 2019-08-04 01:10:17 -07:00
CameronWoof
900d8d00af Officially ends the non-stop thrill ride of coating the station in your various fluids for "fun" 2019-08-03 20:37:02 -07:00
kevinz000
64267c7ce2 Merge pull request #9001 from Linzolle/skirtfix
fix sec and hos skirts
2019-08-01 23:26:07 -07:00
Poojawa
dc3f178e65 Improves vore sound efficency
Also ghosts won't be able to hear any sounds or see any messages at all anymore.
2019-07-31 22:12:08 -05:00
Ghommie
a06de7c3b7 mistake. 2019-07-31 13:26:47 +02:00
Ghommie
b000aa4673 Fixes the dark sabre donator item. 2019-07-31 13:06:51 +02:00
Ghommie
06271dfcff aching special case. 2019-07-31 03:12:09 +02:00
Ghommie
991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. 2019-07-31 02:43:40 +02:00
kevinz000
26c195dec8 Merge pull request #8971 from Linzolle/toxiclover
makes slimepeople like toxic food
2019-07-29 04:39:12 -07:00
kevinz000
11628431b4 Merge pull request #8976 from Ghommie/Ghommie-cit157
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-29 04:38:14 -07:00
Linzolle
3c181af4b0 modular_citadel bad 2019-07-29 01:17:45 -05:00
Ghommie
2b224400e3 Adds in worn overlays for different types of cuffs. 2019-07-29 04:31:27 +02:00
Ghommie
1adaf01839 Fixes combatmode disarm pushing people on inaccessible tables and more. 2019-07-26 22:55:46 +02:00
Linzolle
99720f12e5 makes slimepeople like toxic food 2019-07-25 20:55:18 -05:00
kevinz000
692f2322c0 Merge pull request #8928 from Ghommie/Ghommie-cit121
Reverts a commit that reverted a fix.
2019-07-25 17:43:14 -07:00
kevinz000
29c0a56fb9 Merge pull request #8929 from Ghommie/Ghommie-cit152
Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites.
2019-07-25 17:41:42 -07:00
kevinz000
b6f2c67177 Merge pull request #8949 from Trilbyspaceclone/patch-194
Removes armor from all star treck outfits/suits
2019-07-25 17:40:08 -07:00
kevinz000
ff08743f65 Merge pull request #8934 from Trilbyspaceclone/loadout
Removes a Rando plushies from loadout and adds in a few more items
2019-07-23 20:33:09 -07:00
kevinz000
61e94bd7db Merge pull request #8940 from Citadel-Station-13/borgplush
Borg Plush - Donator
2019-07-23 20:30:16 -07:00
Trilbyspaceclone
6db3502294 Update trek_under.dm 2019-07-23 01:09:58 -04:00
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
Jay
ad036ac36d adds for donator 2019-07-21 12:37:43 -05:00
TrilbySpaceClone
f315696937 fix n stuff 2019-07-20 22:19:03 -04:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
kevinz000
fc7a305c46 Merge pull request #8906 from Ghommie/Ghommie-cit141
Sweaters now cover the groins too.
2019-07-20 11:49:58 -07:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie
7e99dd205a Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites. 2019-07-19 21:54:48 +02:00
kevinz000
a28d6b2b5a Update cit_emotes.dm 2019-07-18 13:22:44 -07:00
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
2019-07-17 18:07:57 -04:00
kevinz000
b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy
Adds discount plushies and a way to get random plushies at shift start
2019-07-17 00:50:21 -07:00
Ghommie
927baaa333 Fk mdlr ctdl 2019-07-17 01:05:09 +02:00
Ghommie
b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
Ghommie
acaf628d89 Sweaters now cover groin too. 2019-07-16 10:23:02 +02:00
kevinz000
0c658ba41a Merge pull request #8796 from Trilbyspaceclone/patch-190
Russian Paratrooper Jumper Uniform fix
2019-07-14 14:44:01 -07:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
kevinz000
a573689101 Merge pull request #8887 from Poojawa/last-word-hearing-psychics
Gang victory news report and last words for discord bot
2019-07-14 14:04:20 -07:00
kevinz000
d5f156925d Merge pull request #8884 from Ghommie/Ghommie-cit135
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
2019-07-14 03:37:36 -07:00
kevinz000
735fc5fab6 Merge pull request #8845 from Ghommie/Ghommie-cit121
Tweaking the 🅱️ emoji icon.
2019-07-14 03:35:33 -07:00
kevinz000
44e9721d37 Merge pull request #8883 from CameronWoof/codifying-mrp
Hexacrocin overdose no longer forces climax
2019-07-14 03:34:37 -07:00
deathride58
a27222fba7 Merge pull request #8752 from Sishen1542/uhhhhh
Slimepeople can now morph the shape and size of their genitalia.
2019-07-13 20:15:28 -04:00
Poojawa
245bd3e650 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics 2019-07-13 10:18:13 -05:00