 kiwedespars
|
2c362dd84f
|
Update uplink_bundles.dm
|
2020-04-19 15:58:31 -07:00 |
|
|
kiwedespars
|
c3905c8c2b
|
Update uplink_kits.dm
|
2020-04-19 15:56:31 -07:00 |
|
|
Detective Google
|
0c2f0a99d5
|
fixes the fact that some citadel null rods aren't null rod subtypes
|
2020-04-19 17:18:40 -05:00 |
|
|
Detective Google
|
5376ca81b5
|
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-19 16:57:02 -05:00 |
|
|
Winter Flare
|
8e3f48a761
|
Reduces (or gives) weight classes to several items.
|
2020-04-19 17:13:19 -04:00 |
|
|
Winter Flare
|
dc5c8fb657
|
Ups Crab Meat from 1 to 4
|
2020-04-19 17:00:48 -04:00 |
|
|
CitadelStationBot
|
22dd41925f
|
Merge pull request #11937 from Citadel-Station-13/Ghommie-patch-3
Fixing critter crates having an invalid icon state when opened.
|
2020-04-19 15:11:28 -05:00 |
|
|
TrilbySpaceClone
|
37a0fb558c
|
with fixes and new gauze
|
2020-04-19 15:29:48 -04:00 |
|
|
Lin
|
88b5ca72b7
|
Merge pull request #11906 from Citadel-Station-13/Ghommie-patch-2
Fixing Forensic scanners not reading blood DNA.
|
2020-04-19 16:53:54 +00:00 |
|
|
Lin
|
d75e3f79bd
|
Merge pull request #11917 from Ghommie/Ghommie-cit688
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-19 16:52:33 +00:00 |
|
|
Ghom
|
8551998833
|
Update critter.dm
|
2020-04-19 14:07:13 +02:00 |
|
|
kevinz000
|
792af56b67
|
Update riding.dm
|
2020-04-19 00:48:51 -07:00 |
|
|
Anonymous
|
043950a3ee
|
Merge branch 'master' into trek_tmp
# Conflicts Resolved:
# icons/obj/clothing/uniforms.dmi
|
2020-04-19 09:51:21 +03:00 |
|
|
Ghom
|
f714403d6e
|
Merge pull request #11895 from Seris02/piggybackfix
fixes piggyback merging
|
2020-04-19 04:56:04 +02:00 |
|
|
Trilbyspaceclone
|
2039fb80e6
|
Update fancy.dm
|
2020-04-18 22:37:05 -04:00 |
|
|
kevinz000
|
24370db5eb
|
Merge pull request #11930 from Ghommie/Ghommie-cit693
More ToS Compliance.
|
2020-04-18 19:33:10 -07:00 |
|
|
kevinz000
|
ab01d91971
|
Merge pull request #11903 from Ghommie/Ghommie-cit687
fix for my relatively minuscule backend refactor for holodeck.
|
2020-04-18 19:32:50 -07:00 |
|
|
kevinz000
|
b65ad491b4
|
Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2
Revert "Makes so turning in place updates riders when riding someone's back"
|
2020-04-18 19:32:34 -07:00 |
|
|
kevinz000
|
5fd862e19d
|
Merge pull request #11860 from Trilbyspaceclone/shields!
Adds more shields and tweaks a few!
|
2020-04-18 19:32:09 -07:00 |
|
|
Trilbyspaceclone
|
42b81fee3d
|
Update drink_reagents.dm
|
2020-04-18 21:57:36 -04:00 |
|
|
Ghommie
|
98081aa56b
|
Some mispelled filepaths.
|
2020-04-19 03:15:51 +02:00 |
|
|
Ghommie
|
d5a43be181
|
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-19 03:07:45 +02:00 |
|
|
Ghom
|
6e62f7a2a3
|
Merge pull request #11878 from Arturlang/fixes_zipties_being_red
Makes zipties white again
|
2020-04-19 02:45:31 +02:00 |
|
|
Ghommie
|
39aef14924
|
More ToS Compliance.
|
2020-04-19 02:40:58 +02:00 |
|
|
Lin
|
8d8a0b0f45
|
Merge pull request #11899 from Ghommie/Ghommie-cit686
Fixing some more mistakes I did to clothing.
|
2020-04-19 00:24:29 +00:00 |
|
|
Ghommie
|
9c8f6cd00f
|
peeves.
|
2020-04-19 02:03:05 +02:00 |
|
|
Ghommie
|
e3fb978465
|
Shielded element.
|
2020-04-19 01:48:51 +02:00 |
|
|
Ghom
|
998b199dba
|
Merge pull request #11927 from kappa-sama/patch-22
ports tg's fix to instant surgery closing
|
2020-04-19 01:21:23 +02:00 |
|
|
Ghom
|
7e57a3410e
|
Merge pull request #11905 from Putnam3145/fix-rads-again
Fixes a divide-by-zero
|
2020-04-19 00:32:41 +02:00 |
|
|
Putnam
|
9976fab42b
|
Made traitor classes rerollable, reassignable by admins
|
2020-04-18 14:40:41 -07:00 |
|
|
kappa-sama
|
2654352d0c
|
tg surgery fixes time
|
2020-04-18 17:37:19 -04:00 |
|
|
Trilbyspaceclone
|
efdab85261
|
Update crayons.dm
|
2020-04-18 17:10:31 -04:00 |
|
|
Trilbyspaceclone
|
a5b7f506f9
|
Update chem_dispenser.dm
|
2020-04-18 16:42:46 -04:00 |
|
|
Trilbyspaceclone
|
63524b47c3
|
Why is ice and water so filling?
|
2020-04-18 16:28:51 -04:00 |
|
|
Trilbyspaceclone
|
26facfa37a
|
honey changes + complie
|
2020-04-18 16:24:05 -04:00 |
|
|
Trilbyspaceclone
|
54cce75679
|
Update food_reagents.dm
|
2020-04-18 16:15:40 -04:00 |
|
|
necromanceranne
|
97bd52f03e
|
haha me too
|
2020-04-19 04:49:11 +10:00 |
|
|
necromanceranne
|
cb39ba3491
|
Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps
|
2020-04-19 04:25:41 +10:00 |
|
|
Ghom
|
957e92ed8f
|
Update microwave.dm
|
2020-04-18 19:53:31 +02:00 |
|
|
Ghommie
|
811f65e48b
|
Removing troublesome and filler uplink items.
|
2020-04-18 19:51:09 +02:00 |
|
|
Ghommie
|
cc16027d1a
|
Nerfing the bonus reagents from upgraded microwaves.
|
2020-04-18 19:30:14 +02:00 |
|
|
Ghommie
|
59f2b66fd9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit689
|
2020-04-18 18:44:46 +02:00 |
|
|
Ghommie
|
0663a3f01c
|
ceiling to avoid infinity ez nutriment.
|
2020-04-18 18:18:22 +02:00 |
|
|
Ghommie
|
08b0a2460e
|
Comment.
|
2020-04-18 17:55:34 +02:00 |
|
|
Ghommie
|
beb34321e7
|
nerf to biogenerator upgrades and purge of inorganic glass bottles designs.
|
2020-04-18 17:53:00 +02:00 |
|
|
TrilbySpaceClone
|
42bb01057f
|
now with working code!
|
2020-04-18 10:09:15 -04:00 |
|
|
TrilbySpaceClone
|
8ca7bb7535
|
Right...
|
2020-04-18 09:46:56 -04:00 |
|
|
Ghommie
|
8d4a67fedc
|
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-18 15:40:18 +02:00 |
|
|
Anonymous
|
64116857cf
|
Merge branch 'master' into trek_tmp
|
2020-04-18 16:34:21 +03:00 |
|
|
TrilbySpaceClone
|
344c8b1334
|
Hmm
|
2020-04-18 08:28:14 -04:00 |
|