 kevinz000
|
77667dc1d2
|
Update twohanded.dm
|
2020-02-05 04:51:16 -07:00 |
|
|
kevinz000
|
477853891d
|
Update twohanded.dm
|
2020-02-04 23:54:10 -07:00 |
|
|
kevinz000
|
f3d955f397
|
Merge branch 'master' into staves
|
2020-02-04 14:54:35 -07:00 |
|
|
kevinz000
|
13df3dbb05
|
Merge pull request #10867 from Ghommie/Ghommie-cit551
Further buff and fix to the clown ops' tearstache grenade.
|
2020-02-04 03:55:22 -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
|
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
|
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 |
|
|
Artur
|
5bf1ebaa53
|
Initial Commit
|
2020-02-03 12:01:17 +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
|
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
|
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 |
|
|
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
|
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
|
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
|
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 |
|
|
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 |
|
|
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
|
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
|
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 |
|
|
YakumoChen
|
4c4fda8091
|
line ending
|
2020-01-31 14:14:34 +00:00 |
|
|
YakumoChen
|
89134d8b30
|
updates fancy
the boxes actually work now
|
2020-01-31 08:52:45 -05:00 |
|
|
Arturlang
|
d26ca9dbf0
|
Fixes this
|
2020-01-31 13:57:30 +01:00 |
|
|
YakumoChen
|
1ed4b90e5f
|
update fancy
|
2020-01-31 07:14:58 -05:00 |
|