Ghom
|
6f66d76680
|
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
|
2020-02-02 19:08:57 +01:00 |
|
Ghom
|
fb32b018ef
|
Merge pull request #10838 from Owai-Seek/loadout
Minor Loadout/Outfit Changes
|
2020-02-02 18:07:00 +01:00 |
|
kevinz000
|
c94b5688db
|
Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
|
2020-02-02 03:16:01 -07:00 |
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
kevinz000
|
2cdf7fa0bb
|
Merge pull request #10784 from Seris02/polycoats
polychromic winter coats
|
2020-02-02 01:46:58 -07:00 |
|
kevinz000
|
333c0dd201
|
Update modular_citadel/code/modules/reagents/reagents/cit_reagents.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-02 01:32:54 -07:00 |
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
Ghom
|
c26c0cbe09
|
Merge pull request #10816 from ancientpower/ph-strip-fix
pH strip feedback fix/tweak
|
2020-02-02 01:40:49 +01:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Ghom
|
a40d22fa45
|
Merge pull request #10800 from Seris02/moreslots
fixes kevinz error with preferences.dm
|
2020-02-01 18:44:29 +01:00 |
|
Ghommie
|
8923810de2
|
Something about runtime errors.
|
2020-02-01 07:19:49 +01:00 |
|
Winter Flare
|
c3ca884273
|
Moved Nurse Stuff below Scrubs
|
2020-01-31 23:08:31 -05:00 |
|
Winter Flare
|
847946bfe3
|
Fix cause I'm dumb
|
2020-01-31 22:53:27 -05:00 |
|
Winter Flare
|
12c0e475d8
|
Add Nurse Stuff to Loadout, fixes.
|
2020-01-31 22:36:25 -05:00 |
|
Winter Flare
|
599185654f
|
Rename, Add item to Loadout
Renamed scrubs based on color, added Mailman Hat to loadout.
|
2020-01-31 21:54:21 -05:00 |
|
Ghom
|
0925dc55c2
|
Merge pull request #10789 from Putnam3145/whoops-text
Minor typo fix
|
2020-02-01 01:42:08 +01:00 |
|
ancientpower
|
60476560cf
|
concatenation tweak
|
2020-01-31 18:23:13 -06:00 |
|
ancientpower
|
c5e5092749
|
fixes a typo with ph strips and adds feedback
|
2020-01-31 17:29:52 -06:00 |
|
Ghommie
|
7f14fa3c71
|
not-so-wip now.
|
2020-01-31 19:20:59 +01:00 |
|
YakumoChen
|
9ba8a0e8e0
|
empty line
|
2020-01-31 14:15:59 +00:00 |
|
YakumoChen
|
babeea0b28
|
empty line
|
2020-01-31 14:15:38 +00:00 |
|
YakumoChen
|
77f6074c67
|
adds rings to loadout
|
2020-01-31 08:56:20 -05:00 |
|
Seris02
|
52e86a1ad6
|
yeet
|
2020-01-31 13:13:06 +08:00 |
|
Seris02
|
924d8a676c
|
fixes kevinz error
|
2020-01-31 10:07:01 +08:00 |
|
necromanceranne
|
43c4debb4f
|
Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits.
|
2020-01-31 11:54:18 +11:00 |
|
Putnam
|
e9c3eb9eb4
|
.
|
2020-01-30 04:24:18 -08:00 |
|
Seris02
|
dbb6218e0d
|
merp
|
2020-01-30 14:54:07 +08:00 |
|
kevinz000
|
9df12f94d4
|
Merge branch 'master' into one_last_taser_attempt
|
2020-01-29 16:27:58 -07:00 |
|
kevinz000
|
cff69db1c3
|
Merge pull request #10773 from Putnam3145/whoops-gaseous
Fixes to hypno toggle
|
2020-01-29 15:51:01 -07:00 |
|
Lin
|
15f36fab60
|
Merge pull request #10763 from Citadel-Station-13/cosmosbedsheet
Adds cosmic bedsheet to loadout for donator
|
2020-01-29 19:43:01 +00:00 |
|
Putnam
|
7626750c49
|
hypno tweaks
|
2020-01-28 23:03:29 -08:00 |
|
kevinz000
|
c5fdc24e73
|
Merge pull request #10696 from Citadel-Station-13/Ghommie-patch-1
Whops, I forgot that was a get_hearers_in_view()
|
2020-01-28 17:58:40 -07:00 |
|
kevinz000
|
3de59b75fa
|
Merge pull request #10678 from Ghommie/Ghommie-cit516
Stops the donor patriotic cape from being considered a bed sheet.
|
2020-01-28 17:58:07 -07:00 |
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
Jay
|
7171b661d1
|
Adds cosmic bedsheet to loadout for donator
|
2020-01-27 22:15:00 -06:00 |
|
kevinz000
|
0eb13d8f23
|
refactors guns a bit
|
2020-01-27 17:39:49 -07:00 |
|
kevinz000
|
2e6cfef224
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-01-25 22:13:28 -07:00 |
|
Ghom
|
98c8b6c5c8
|
Merge pull request #10648 from Citadel-Station-13/kevinz000-patch-19
Sprinting in general is now a config
|
2020-01-26 05:53:53 +01:00 |
|
kevinz000
|
2acb52fb56
|
Merge pull request #10690 from Ghommie/Ghommie-cit525
Additional runtime fixes.
|
2020-01-25 05:54:35 -07:00 |
|
kevinz000
|
d86af199f5
|
initialize
|
2020-01-24 21:22:59 -07:00 |
|
kevinz000
|
ea9513864d
|
Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
|
2020-01-24 16:14:32 -07:00 |
|
Ghommie
|
6fe0c57c42
|
run-extra-times fixes.
|
2020-01-24 20:48:32 +01:00 |
|
Ghom
|
d5daae98c7
|
Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
|
2020-01-24 18:46:25 +01:00 |
|
Ghom
|
4f611a31ff
|
viewers() instead of get_hearers_in_view()
|
2020-01-24 16:57:30 +01:00 |
|
kevinz000
|
f626322fbd
|
Merge pull request #10650 from Arturlang/patch-5
[READY]Adds cheap modular computers to the loadout
|
2020-01-24 00:32:57 -07:00 |
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
Trilbyspaceclone
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
Ghommie
|
52d5074051
|
Stops the patriotic cape from being considered a bed sheet.
|
2020-01-23 18:19:31 +01:00 |
|
Unknown
|
bd8ce9a7b6
|
Culturally Appropriate Lunar Clothes
|
2020-01-23 06:35:50 -07:00 |
|
Ghommie
|
762064edc0
|
Uhh...
|
2020-01-23 04:43:24 +01:00 |
|