silicons
|
9ae040b904
|
Merge pull request #12657 from bunny232/witchhunterhat
Witch hunter hat tweak.
|
2020-07-02 01:48:19 -07:00 |
|
silicons
|
e2975a44a1
|
Merge branch 'master' into policy
|
2020-07-02 01:23:19 -07:00 |
|
Timothy Teakettle
|
15e137dd18
|
Merge branch 'master' into tray-and-jar
|
2020-07-01 22:06:17 +01:00 |
|
Timothy Teakettle
|
8a0ab009dd
|
give trays better capacity
|
2020-07-01 22:05:14 +01:00 |
|
kappa-sama
|
406af65d93
|
you need 5 of these
|
2020-07-01 08:12:35 -04:00 |
|
kappa-sama
|
9cc6f5aa91
|
durathread->string
|
2020-07-01 08:09:43 -04:00 |
|
kappa-sama
|
0b0d9ff1a6
|
this
|
2020-07-01 07:56:55 -04:00 |
|
kappa-sama
|
cfc14a04f1
|
Merge branch 'master' into patch-28
|
2020-07-01 07:48:46 -04:00 |
|
kappa-sama
|
1f38c3029c
|
yeah ok
|
2020-07-01 07:40:43 -04:00 |
|
YakumoChen
|
ed017cc22a
|
Update sheet_types.dm
|
2020-07-01 08:53:08 +00:00 |
|
bunny232
|
afe9b2dfbd
|
Update holy_weapons.dm
|
2020-06-30 11:15:40 -04:00 |
|
Ghommie
|
cd1c5511a4
|
Fixing two handed items and etcetera.
|
2020-06-30 16:24:04 +02:00 |
|
silicons
|
2039496739
|
groan
|
2020-06-30 03:05:15 -07:00 |
|
silicons
|
84f6efe683
|
Update shields.dm
|
2020-06-29 23:22:48 -07:00 |
|
timothyteakettle
|
1748088d42
|
small sprite improvement
|
2020-06-30 00:56:54 +01:00 |
|
timothyteakettle
|
b36ce5ee5f
|
starts locked so it doesnt look ass
|
2020-06-30 00:47:38 +01:00 |
|
timothyteakettle
|
bbd9d3c61f
|
better air
|
2020-06-30 00:38:33 +01:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
Timothy Teakettle
|
0e57e0dd7a
|
atmos
|
2020-06-30 00:09:14 +01:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
Timothy Teakettle
|
3eb5901a57
|
air is good
|
2020-06-29 22:56:25 +01:00 |
|
Cirno
|
03d79a1b65
|
I think this changed pills?
|
2020-06-29 18:52:21 -03:00 |
|
silicons
|
26fee48cec
|
Merge pull request #12645 from Ghommie/Ghommie-cit825
More and more fixes.
|
2020-06-29 14:18:10 -07:00 |
|
Putnam3145
|
ee2fedd4af
|
Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
|
2020-06-29 12:44:33 -07:00 |
|
Ghom
|
b280c0f550
|
Merge pull request #12622 from timothyteakettle/grammar-fixes
big batch of spelling/grammar corrections
|
2020-06-29 21:13:06 +02:00 |
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
Timothy Teakettle
|
70a2238f04
|
more pet carrier changes
|
2020-06-29 17:43:16 +01:00 |
|
timothyteakettle
|
2e4c5e322d
|
tray and jar
|
2020-06-29 02:49:31 +01:00 |
|
silicons
|
2ab69c0170
|
Merge pull request #12603 from b1tt3r1n0/Pouches(again)
Some edits to pouches, and something that can hold sheets.
|
2020-06-27 14:54:57 -07:00 |
|
silicons
|
45a6061958
|
Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
|
2020-06-27 14:53:28 -07:00 |
|
silicons
|
8b04fd70de
|
Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
|
2020-06-27 14:52:59 -07:00 |
|
silicons
|
1d4a54d880
|
log
|
2020-06-26 23:47:16 -07:00 |
|
silicons
|
0df5aa083b
|
policies and code hooks
|
2020-06-26 23:41:44 -07:00 |
|
timothyteakettle
|
b94267e1e1
|
more spellchecks
|
2020-06-27 02:41:50 +01:00 |
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
Ghommie
|
8f6b31c26e
|
Solving several issues.
|
2020-06-26 18:40:20 +02:00 |
|
Artur
|
765ffdb1a1
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-26 14:03:27 +03:00 |
|
silicons
|
54c8d58e52
|
Update clown_items.dm
|
2020-06-24 23:20:51 -07:00 |
|
b1tt3r1n0
|
a780b9037c
|
Some edits to pouches, and something that can hold sheets.
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
|
2020-06-24 23:07:56 -04:00 |
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +02:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
Lin
|
2cd18f3dba
|
Merge pull request #12557 from silicons/life
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
|
2020-06-21 18:32:58 -05:00 |
|
silicons
|
99a7c49e52
|
Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
|
2020-06-21 14:11:10 -07:00 |
|
Ghommie
|
29a8d2ed78
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
|
2020-06-20 00:07:47 +02:00 |
|
shellspeed1
|
9197cb4813
|
allows storage in medbelts and organ boxes.
|
2020-06-18 21:06:22 -07:00 |
|
Timothy Teakettle
|
0d197e82f8
|
Merge branch 'master' into cool-ipcs
|
2020-06-19 01:57:02 +01:00 |
|
kevinz000
|
1b5ea90c8f
|
sigh
|
2020-06-18 08:16:05 -07:00 |
|
shellspeed1
|
b490f02c78
|
Ports IV bags from TG
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
|
2020-06-18 02:30:58 -07:00 |
|