kevinz000
|
c24c83c1bd
|
Merge pull request #10835 from Ghommie/Ghommie-cit546
Something about runtime errors.
|
2020-02-02 16:31:15 -07:00 |
|
kevinz000
|
341430eab5
|
Merge pull request #10836 from Hatterhat/rcd-carts-engifab
adding stuff to techfabs - RCD carts, combifans
|
2020-02-02 16:30:59 -07:00 |
|
Ghom
|
d4aa410af0
|
Update atoms.dm
|
2020-02-02 23:18:30 +01:00 |
|
deathride58
|
10c95fa111
|
Makes quick item usage (click-dragging unequipped item) require combat mode to be enabled
|
2020-02-02 13:38:32 -05:00 |
|
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
|
97be223b0b
|
Merge pull request #10799 from Seris02/goldentoolboxfix
makes the golden ""plastitanium"" toolbox actually plastitanium
|
2020-02-02 19:08:16 +01:00 |
|
Ghom
|
8a81ba9efe
|
Ok here we go.
|
2020-02-02 18:40:06 +01:00 |
|
Ghom
|
ee533da3d7
|
Putting GLOB.blood_reagent_types at use.
|
2020-02-02 18:34:14 +01:00 |
|
Ghom
|
96a38e6c18
|
Merge pull request #10837 from Owai-Seek/tinytweaks
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
|
2020-02-02 18:07:25 +01:00 |
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
kevinz000
|
66a2216ef3
|
Merge pull request #10829 from Ghommie/Ghommie-cit544
Fixed and brutalized clown op slippery weapons a little.
|
2020-02-02 03:16:23 -07: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
|
88c20b1ea5
|
Merge pull request #10834 from Trilbyspaceclone/patch-273
Craftable Crates!
|
2020-02-02 01:43:32 -07:00 |
|
kevinz000
|
3fc832fbe7
|
Merge pull request #10819 from Ghommie/Ghommie-cit541
clown ops infiltrator consistency.
|
2020-02-02 01:39:08 -07:00 |
|
kevinz000
|
664c4cdea9
|
Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1
Fixing chaplain armaments beacon edge case.
|
2020-02-02 01:38:34 -07:00 |
|
kevinz000
|
e97af26236
|
ok ghom
|
2020-02-02 01:37:11 -07:00 |
|
Putnam
|
e812844c70
|
Revert "</span>"
This reverts commit d6d01d848c.
|
2020-02-01 21:05:27 -08:00 |
|
Ghommie
|
fedb05b3be
|
A PR about runtime errors
|
2020-02-02 05:43:38 +01:00 |
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
Seris02
|
d89e0de32c
|
yeehaw
|
2020-02-02 11:43:20 +08:00 |
|
Ghom
|
5b91908674
|
Fixing little blood bank gnerator examine runtime.
|
2020-02-02 04:27:17 +01: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 |
|
Hatterhat
|
e985d21ea3
|
fucking combifan
|
2020-02-01 20:23:01 -06:00 |
|
Ghom
|
2bb0a0311a
|
Merge pull request #10796 from Tupinambis/StatusBugFix
Status Display Fix: It's About Time
|
2020-02-02 01:51:07 +01:00 |
|
Ghom
|
3337181cac
|
Merge pull request #10352 from Seris02/smchanges
Changes to the way SM handles power related to integrity and max integrity damage
|
2020-02-01 18:46:10 +01:00 |
|
Putnam
|
d6d01d848c
|
</span>
|
2020-02-01 06:01:54 -08:00 |
|
Winter Flare
|
59b5b0b9a6
|
A bunch of tiny tweaks.
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
|
2020-02-01 04:49:56 -05:00 |
|
Putnam3145
|
33122d0d92
|
Merge branch 'master' into TGUIs_Nexties
|
2020-02-01 00:49:10 -08:00 |
|
Putnam
|
50a53c6558
|
aaand a formatting oddity
|
2020-02-01 00:47:44 -08:00 |
|
Putnam
|
3d9e84a3f8
|
Tweaks and fixes
|
2020-02-01 00:23:45 -08:00 |
|
Trilbyspaceclone
|
4625d4f25d
|
Update sheet_types.dm
|
2020-02-01 01:56:41 -05:00 |
|
Ghommie
|
8923810de2
|
Something about runtime errors.
|
2020-02-01 07:19:49 +01:00 |
|
Trilbyspaceclone
|
4b7e5916bf
|
Update crates.dm
|
2020-02-01 01:09:35 -05:00 |
|
Trilbyspaceclone
|
fa40490915
|
Update sheet_types.dm
|
2020-02-01 01:08:14 -05:00 |
|
Ghom
|
e7589715a8
|
Fixing chap armaments beacon.
|
2020-02-01 05:13:29 +01:00 |
|
Ghommie
|
7ce0369e48
|
Oh man.
|
2020-02-01 05:05:07 +01:00 |
|
Ghommie
|
07b6d278a1
|
fixed and brutalized clown op slippery weapons a little.
|
2020-02-01 04:48:40 +01:00 |
|
ShadeAware
|
c46c683664
|
FIXES FANCY SWITCHBLADES
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
|
2020-01-31 21:12:08 -05:00 |
|
Ghom
|
3519fbc909
|
F
|
2020-02-01 02:16:52 +01:00 |
|
Ghom
|
c9e315a9e6
|
Merge pull request #10781 from r4d6/RPD
RPD icon reorder, less building pixelhunting
|
2020-02-01 01:48:59 +01:00 |
|
Ghom
|
fddd79b466
|
Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4
Gangs can now only tag with GANG spraycans, rather than lathed spraycans
|
2020-02-01 01:44:19 +01:00 |
|
Ghom
|
327bfcac2f
|
Merge pull request #10786 from Commandersand/frick
made the centcomm suit syndies order be a variant with no sensors
|
2020-02-01 01:42:55 +01:00 |
|
Ghommie
|
ab4aa29576
|
clown ops infiltrator consistency.
|
2020-02-01 00:02:31 +01:00 |
|
Artur
|
54cd2585cf
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-01-31 23:18:51 +01:00 |
|
Putnam
|
425f532f76
|
WHOOPS
|
2020-01-31 13:12:50 -08:00 |
|
Putnam
|
809f57a15d
|
also added kill-once objectives
|
2020-01-31 12:25:19 -08:00 |
|
Putnam
|
29e0ac52c4
|
fuzzy objectives
|
2020-01-31 11:52:05 -08:00 |
|
Tupinambis
|
5f58173038
|
I kinda completely fucked my original stunbaton PR. This is just a rePR of it.
|
2020-01-31 11:55:52 -06:00 |
|