 silicons
|
8f30d7f4d1
|
Update code/datums/components/storage/concrete/bag_of_holding.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-06-30 20:27:30 -07:00 |
|
|
Ghommie
|
cd1c5511a4
|
Fixing two handed items and etcetera.
|
2020-06-30 16:24:04 +02:00 |
|
|
Artur
|
fa6386f1a9
|
Skills and clockwork build
|
2020-06-30 16:08:31 +03:00 |
|
|
silicons
|
837a77585c
|
Update bag_of_holding.dm
|
2020-06-30 00:41:09 -07:00 |
|
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03: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 |
|
|
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 |
|
|
Putnam3145
|
42809d8b0c
|
Merge pull request #12416 from Ghommie/Ghommie-cit792
TGUI-next Check Skills menu.
|
2020-06-29 12:44:08 -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 |
|
|
Ghommie
|
5307676317
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
|
2020-06-29 06:55:35 +02:00 |
|
|
Ghommie
|
65ffadaa18
|
Few issues, solved.
|
2020-06-28 04:51:02 +02:00 |
|
|
silicons
|
e51bee9649
|
Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
|
2020-06-27 14:54:31 -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 |
|
|
L
|
3aefc8ae10
|
tg changes
|
2020-06-27 07:01:19 -03: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 |
|
|
Detective Google
|
57fca41e20
|
aeugh2
|
2020-06-25 15:22:11 -05:00 |
|
|
Ghommie
|
04902e1fc5
|
Whoops
|
2020-06-24 23:32:31 +02:00 |
|
|
Ghommie
|
c0e0226d3c
|
faction check.
|
2020-06-24 23:18:03 +02:00 |
|
|
Ghommie
|
fe3932a36e
|
Fixing the snore-pocalypse, and another not so critical issue.
|
2020-06-24 23:08:40 +02:00 |
|
|
Ghommie
|
ba794a3283
|
Looks like there are chunks of reagents updates I gotta port later.
|
2020-06-24 21:22:08 +02:00 |
|
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +02:00 |
|
|
silicons
|
b367f76c62
|
autobunker
|
2020-06-24 07:49:45 -07: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 |
|
|
silicons
|
78df740d19
|
Update debuffs.dm
|
2020-06-22 13:24:36 -07: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 |
|
|
Ghommie
|
48c13fcc10
|
Removing now unused old embed behavior
|
2020-06-20 00:15:52 +02: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 |
|
|
Ghom
|
e31ce2edcf
|
Merge pull request #12414 from LetterN/asset-cache-thing
asset cache + better minimaps
|
2020-06-19 23:09:09 +02:00 |
|
|
Ghommie
|
d555394290
|
Let's just use tgstation's.
|
2020-06-19 19:01:05 +02:00 |
|
|
Lin
|
3cdc73ff35
|
Merge pull request #12487 from kevinz000/erp_2
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
|
2020-06-18 13:37:10 -05:00 |
|
|
kevinz000
|
445d94f335
|
haha whew
|
2020-06-17 21:32:10 -07:00 |
|
|
kevinz000
|
118ac1a775
|
Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
|
2020-06-17 20:10:04 -07:00 |
|
|
Timothy Teakettle
|
2229db2214
|
Merge branch 'master' into embed-changes
|
2020-06-17 16:40:34 +01:00 |
|
|
SmArtKar
|
170a38a3a7
|
Porting sutures and meshes from /TG/ (#12532)
* Porting sutures and meshes from /TG/
* Recipes fix
|
2020-06-16 16:22:56 -07:00 |
|
|
Timothy Teakettle
|
2d1d2eeda6
|
final fixes
|
2020-06-16 23:47:22 +01:00 |
|
|
Timothy Teakettle
|
d10dfbec5e
|
fix maps but it works
|
2020-06-16 16:23:53 +01:00 |
|
|
Ghommie
|
b13fcf9f2c
|
WIP, let's just use TG's cause i'm dull
|
2020-06-16 03:22:04 +02:00 |
|
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
|
Timothy Teakettle
|
7fbfb4ad0e
|
Merge remote-tracking branch 'upstream/master' into embed-changes
|
2020-06-15 22:48:26 +01:00 |
|
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
|
Ghommie
|
02a21081a6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792
|
2020-06-15 02:21:21 +02:00 |
|
|
kevinz000
|
433b42957c
|
Update severe.dm
|
2020-06-13 14:14:00 -07:00 |
|
|
kevinz000
|
6bfdb762d4
|
Update tackle.dm
|
2020-06-13 14:13:01 -07:00 |
|