Fermi
|
e30f72067e
|
Merge branch 'master' into NeuroFix
|
2019-08-12 00:00:28 +01:00 |
|
kevinz000
|
123b478edd
|
Merge pull request #8927 from Ghommie/Ghommie-cit151
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-08-11 10:12:20 -07:00 |
|
Fermi
|
251ac24e02
|
[NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction.
|
2019-08-11 00:35:36 +01:00 |
|
Fermi
|
eb9e6a041d
|
Ghommie's fix.
|
2019-08-09 12:17:54 +01:00 |
|
Ghommie
|
12c4fc139d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
|
2019-08-09 04:00:23 +02:00 |
|
Fermi
|
9d3aa1f3b0
|
Removing a comment block I missed.
|
2019-08-08 18:28:47 +01:00 |
|
Fermi
|
99e95dcedf
|
Guess who forgot message admins
|
2019-08-07 18:57:38 +01:00 |
|
Fermi
|
b4208860d8
|
Spelling and a few more logs.
|
2019-08-07 17:45:40 +01:00 |
|
Fermi
|
a8e2311caf
|
Bloomin' indents!
|
2019-08-07 14:53:20 +01:00 |
|
Fermi
|
7391581a26
|
2 small fixes.
|
2019-08-07 11:33:53 +01:00 |
|
Fermi
|
f4c5e6fd2f
|
Attempts to deal with the potential future problem of people stunlocking
|
2019-08-06 16:43:55 +01:00 |
|
Thalpy
|
53e9c140cf
|
Merge pull request #22 from Citadel-Station-13/master
YARR
|
2019-08-06 16:08:16 +01:00 |
|
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 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01: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 |
|
Fermi
|
40d6dc1812
|
Oops.
|
2019-08-04 14:54:40 +01: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 |
|
Fermi
|
1f73e6eb1d
|
Notice me!!
|
2019-08-01 03:48:35 +01:00 |
|
Fermi
|
3f75a42ff2
|
Guess who staged before compiling?
|
2019-08-01 03:46:30 +01:00 |
|
Fermi
|
88e6fa4703
|
Yamero!
|
2019-08-01 03:42:57 +01:00 |
|
Fermi
|
18b03f9053
|
Furranium fixes.
|
2019-08-01 03:38:06 +01: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 |
|
Fermi
|
a9330b784a
|
Reward those who try.
|
2019-07-30 23:16:05 +01:00 |
|
Fermi
|
fbbc4d8589
|
Merge branch 'pr/21'
|
2019-07-29 22:57:40 +01: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 |
|
Fermi
|
5e5f2fea54
|
Heck
|
2019-07-29 00:05:26 +01:00 |
|
Fermi
|
d472177a4c
|
A casual cough.
|
2019-07-28 23:59:33 +01:00 |
|
Fermi
|
4c01b7ad57
|
Maybe Oxy so people don't kill themselves.
|
2019-07-28 23:56:30 +01:00 |
|
Fermi
|
b6e2122d8d
|
Fixes, but good.
|
2019-07-28 23:55:25 +01:00 |
|
Fermi
|
d080446a77
|
Merge branch 'pr/20'
|
2019-07-28 23:28:19 +01:00 |
|
Fermi
|
31709938c6
|
Pushing a buncha stuff so I can fix things.
|
2019-07-28 23:23:45 +01: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 |
|