SiliconMain
|
1a78098885
|
on second thought
|
2020-07-26 05:20:53 -05:00 |
|
SiliconMain
|
54ed22d17d
|
ye
|
2020-07-26 05:19:56 -05:00 |
|
SiliconMain
|
d1c3465d77
|
Update belt.dm
|
2020-07-26 04:28:18 -05:00 |
|
silicons
|
9f66163d4f
|
Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
Ports several food sprites/foods from Baystation/Citadel RP
|
2020-07-23 10:35:30 -07:00 |
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
silicons
|
7df369e5d7
|
Merge pull request #12811 from kappa-sama/patch-33
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
|
2020-07-20 16:58:01 -07:00 |
|
silicons
|
267186a5d3
|
Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
|
2020-07-20 16:15:38 -07:00 |
|
Chiirno
|
64d5bd0030
|
switches around messages
|
2020-07-19 21:38:44 -03:00 |
|
Winter Flare
|
e416a2377e
|
Merge branch 'master' into foodport-p2-7/12/20
|
2020-07-19 18:58:52 -04:00 |
|
Timothy Teakettle
|
1b99cb9201
|
everything has the bonesetter
|
2020-07-19 18:32:44 +01:00 |
|
Winter Flare
|
2effbf4db0
|
Fixes Spiral, and Cracker Box
|
2020-07-18 18:53:47 -04:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
Lin
|
ba3dc6a73b
|
Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
|
2020-07-18 17:02:02 -05:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
kappa-sama
|
c39a517519
|
nerf this
|
2020-07-18 03:47:31 -04:00 |
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
silicons
|
04df84d1e0
|
Merge pull request #12776 from timothyteakettle/snail-shells
snail shell backpack
|
2020-07-17 17:07:46 -07:00 |
|
Winter Flare
|
61f4fbc67a
|
Merge branch 'master' into foodport-p2-7/12/20
|
2020-07-17 19:27:50 -04:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
silicons
|
6121cbd091
|
Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
|
2020-07-15 08:50:20 -07:00 |
|
Winter Flare
|
d6413d5559
|
Adds Cracker Box, Soup
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
|
2020-07-14 22:43:34 -04:00 |
|
Timothy Teakettle
|
0a4a0fadb3
|
snails
|
2020-07-14 20:59:25 +01:00 |
|
silicons
|
f99a0564de
|
Merge pull request #12693 from Owai-Seek/trashbag-7-4-20
Trashbag Whitelist Update
|
2020-07-11 21:28:12 -07:00 |
|
Timothy Teakettle
|
c1592ad162
|
more rewards
|
2020-07-11 23:27:29 +01:00 |
|
Chiirno
|
2940f0efa5
|
Update code/game/objects/items/storage/firstaid.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
|
2020-07-10 02:35:42 -04:00 |
|
silicons
|
6d1ca993f6
|
Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
|
2020-07-08 03:10:44 -07:00 |
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Cirno
|
2553ef6dd8
|
Am I finally free?
|
2020-07-05 00:46:56 -03:00 |
|
Winter Flare
|
767290d8e9
|
Trashbag Whitelist Update
Trashbag can now hold:
All Organs
Most Shoes
Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
|
2020-07-04 21:03:31 -04:00 |
|
Cirno
|
c2ba973c88
|
Merge remote-tracking branch 'origin' into emi
|
2020-07-04 15:59:47 -03:00 |
|
Ghommie
|
6fc584518a
|
Fixing (un)equip penalties from obscured inv slots.
|
2020-07-03 00:07:30 +02: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 |
|
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 |
|
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 |
|
timothyteakettle
|
2e4c5e322d
|
tray and jar
|
2020-06-29 02:49:31 +01:00 |
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01: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
|
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
|
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 |
|
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 |
|