 kevinz000
|
f5cd0cf48f
|
Merge pull request #10872 from Arturlang/reflective_ornot
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
|
2020-02-04 03:34:16 -07:00 |
|
|
kevinz000
|
8f83e8c107
|
Merge pull request #10860 from deathride58/combatmodeclickdrag
Makes quick item usage (click-dragging unequipped item) require combat mode
|
2020-02-04 03:32:39 -07:00 |
|
|
kevinz000
|
97583bd98f
|
Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
|
2020-02-04 03:20:34 -07:00 |
|
|
Seris02
|
49f80d52a8
|
bug fixes
|
2020-02-04 17:18:45 +08:00 |
|
|
Ghommie
|
a0caada859
|
runtime drifting
|
2020-02-04 08:05:27 +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
|
09bb223af0
|
eh fine
|
2020-02-03 15:49:41 -07:00 |
|
|
kevinz000
|
9b4e40e3a7
|
on second thought, fitting on OCLOTHING slot is a bad idea
|
2020-02-03 13:48:03 -07:00 |
|
|
kevinz000
|
c69446d2d1
|
woops miscalculated
|
2020-02-03 13:46:54 -07:00 |
|
|
kevinz000
|
dd113f5c71
|
L
|
2020-02-03 13:39:36 -07:00 |
|
|
kevinz000
|
e1ed34dcde
|
s
|
2020-02-03 13:38:18 -07:00 |
|
|
kevinz000
|
8556bcf2b3
|
compile
|
2020-02-03 13:36:10 -07:00 |
|
|
kevinz000
|
70beec5985
|
woops
|
2020-02-03 13:30:41 -07:00 |
|
|
kevinz000
|
e9ec314cf6
|
yo this is a horrible idea
|
2020-02-03 13:15:12 -07:00 |
|
|
kevinz000
|
3e30c9409b
|
riot staves
|
2020-02-03 13:11:26 -07:00 |
|
|
kevinz000
|
8910efadfa
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-02-03 13:07:49 -07:00 |
|
|
Putnam
|
53cad493a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-02-03 03:17:23 -08:00 |
|
|
Artur
|
5bf1ebaa53
|
Initial Commit
|
2020-02-03 12:01:17 +01:00 |
|
|
Ghom
|
ccd557122c
|
Update holosign.dm
|
2020-02-03 08:35:47 +01:00 |
|
|
Ghom
|
f2fd48bfd9
|
Update holosign.dm
|
2020-02-03 08:31:12 +01:00 |
|
|
Ghommie
|
84d9430ee4
|
PC too slow for compile.
|
2020-02-03 07:21:39 +01:00 |
|
|
Ghommie
|
81b5fe2de3
|
Further buff and fix for clown ops tearstache nade.
|
2020-02-03 07:08:47 +01:00 |
|
|
kevinz000
|
2393dc26eb
|
Merge pull request #10779 from Ghommie/Ghommie-cit538
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
|
2020-02-02 16:31:59 -07:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +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 |
|
|
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 |
|
|
Trilbyspaceclone
|
4625d4f25d
|
Update sheet_types.dm
|
2020-02-01 01:56:41 -05:00 |
|