Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
kevinz000
|
34fbcd1dc0
|
fixes
|
2020-02-19 07:49:05 -07:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Ghommie
|
1a0fba8a2a
|
Something about consistency and magnetic rifles.
|
2020-02-16 18:37:51 +01:00 |
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|
kevinz000
|
b9e8be5784
|
Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
|
2020-02-15 12:15:50 -07:00 |
|
kevinz000
|
b705e2fe37
|
Merge pull request #11069 from Ghommie/Ghommie-cit575
Fixing some privates overlays
|
2020-02-15 11:46:18 -07:00 |
|
Seris02
|
2d9c8ce8fc
|
fixing merge conflicts
|
2020-02-15 15:41:52 +08:00 |
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
kevinz000
|
0861179a79
|
Update chat_commands.dm
|
2020-02-13 20:34:48 -07:00 |
|
kevinz000
|
b3a81d9c8e
|
ok
|
2020-02-13 15:59:58 -07:00 |
|
Ghommie
|
a0dc21b01c
|
ok.
|
2020-02-13 12:50:08 +01:00 |
|
Ghommie
|
b8cebf8953
|
Fixing some privates overlays
|
2020-02-13 12:41:36 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
Ghom
|
1fd8ebc2dc
|
Update genitals.dm
|
2020-02-13 08:28:52 +01:00 |
|
Ghom
|
e4a20a16a4
|
Update genitals.dm
|
2020-02-13 08:25:44 +01:00 |
|
Ghom
|
1ef3f45f89
|
Update genitals.dm
|
2020-02-13 08:22:08 +01:00 |
|
Ghom
|
d9885cf278
|
oh damn, forgot those are numbers
|
2020-02-13 08:16:37 +01:00 |
|
Ghom
|
ee10c03630
|
Merge branch 'master' into Ghommie-cit562
|
2020-02-13 08:00:53 +01:00 |
|
kevinz000
|
4e419eed03
|
Merge pull request #10987 from Ghommie/Ghommie-cit567
Something about missing privates sprites and bad code.
|
2020-02-12 23:56:53 -07:00 |
|
Ghom
|
c2baad44d8
|
Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
ENDS THE PLUSHIE DRAMA
|
2020-02-09 21:47:30 +01:00 |
|
Ghommie
|
c68c96373c
|
Ok.
|
2020-02-09 07:07:47 +01:00 |
|
Ghommie
|
f6adce72fb
|
Something about missing private sprites and their bad code.
|
2020-02-09 06:51:57 +01:00 |
|
Ghom
|
71f44a7085
|
Merge pull request #10892 from kevinz000/small_guncode_refactor
Small guncode refactor but it works
|
2020-02-07 23:13:21 +01:00 |
|
kevinz000
|
8107140aaf
|
Merge pull request #10924 from Citadel-Station-13/Ghommie-patch-8
Fixing whitelisted/donor loadouts
|
2020-02-06 23:56:32 -07:00 |
|
kevinz000
|
3f5805a9e8
|
Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
|
2020-02-06 23:52:49 -07:00 |
|
Ghom
|
f38e694673
|
Does it work? Yes. Does it compile? No.
|
2020-02-07 03:42:08 +01:00 |
|
Ghommie
|
2d8f85d810
|
A few nuisances solved.
|
2020-02-07 02:59:59 +01:00 |
|
Ghom
|
2370de52f9
|
Update genitals.dm
|
2020-02-07 02:46:15 +01:00 |
|
Ghommie
|
7f431af99d
|
Ok
|
2020-02-07 01:33:47 +01:00 |
|
Ghommie
|
00042292cf
|
Byond is pretty special.
|
2020-02-07 01:14:19 +01:00 |
|
Ghommie
|
39d6980bab
|
genitals code is so bad.
|
2020-02-07 01:03:59 +01:00 |
|
Ghommie
|
28df05bbb0
|
step 1
|
2020-02-07 00:24:54 +01:00 |
|
Ghommie
|
0703c6eea6
|
First tweak to cargo reagents selling.
|
2020-02-06 22:34:54 +01:00 |
|
kevinz000
|
cda01e10f6
|
Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
|
2020-02-05 23:45:30 -07:00 |
|
Ghom
|
3a1a40ebd2
|
Update read_from_file.dm
|
2020-02-05 23:41:52 +01:00 |
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08:00 |
|
Ghom
|
4b1e3d216f
|
Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
|
2020-02-05 07:19:37 +01:00 |
|
Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
kevinz000
|
8556a6188f
|
Merge remote-tracking branch 'citadel/master' into small_guncode_refactor
|
2020-02-04 03:47:01 -07:00 |
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
kevinz000
|
66fc2e77f0
|
Merge pull request #10865 from Ghommie/Ghommie-cit550
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
|
2020-02-04 03:35:33 -07:00 |
|
Ghommie
|
0eb5aa0a2a
|
Removing a couple troublesome NSFW unused prefs.
|
2020-02-04 04:58:09 +01:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
kevinz000
|
8910efadfa
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-02-03 13:07:49 -07:00 |
|
Ghom
|
f8a2116d7d
|
Merge pull request #10866 from ancientpower/skintone-match-fix
Fixes genital skintone mismatching
|
2020-02-03 08:57:39 +01:00 |
|
ancientpower
|
b55b375d17
|
fixes a bug with skintone in character creation
|
2020-02-02 22:59:36 -06:00 |
|
Ghommie
|
a365f3b499
|
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
|
2020-02-03 05:16:32 +01:00 |
|
kevinz000
|
c24c83c1bd
|
Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
|
2020-02-02 16:31:15 -07:00 |
|