a0666e7454
Merge pull request #11000 from Seris02/rcdfixyeet
...
makes RCDs not cost a single sheet of glass and metal
2020-02-10 12:20:40 +01:00
01390fa0e0
Merge remote-tracking branch 'citadel/master' into attack_chain
2020-02-10 04:18:02 -07:00
e6aa47997c
fix rcd cost
2020-02-10 16:00:21 +08:00
bb641fecf8
Sprites, Tweaks, and Snacks
...
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.
Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
bcbaea4a7b
CallMaterialName reagent fix
2020-02-09 10:46:29 +01:00
5dbfc9a514
Yay
2020-02-08 03:25:09 -05:00
8c2019fcbf
probably fixes plant disk techdisk
2020-02-07 17:58:36 -05:00
c9dc35fd9a
Updates the debug outfit
2020-02-06 18:42:23 +01:00
980d26df76
Cadaver Management
2020-02-06 02:48:30 -05:00
f100b6c5e4
multitools in basic tools, dumb headers
2020-02-05 19:47:20 -06:00
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
3c5e8df7ba
engis can now have it
2020-02-05 03:16:35 -05:00
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
6efe0dc273
haha what if i made everything interfacable
2020-02-04 18:55:19 -06:00
385aea3d14
rcd ammo to indeng, typo
2020-02-04 18:50:09 -06:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
4dfb002d00
Update code/modules/research/techweb/all_nodes.dm
...
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com >
2020-02-04 14:24:37 -05:00
66fc2e77f0
Merge pull request #10865 from Ghommie/Ghommie-cit550
...
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
2020-02-04 03:35:33 -07:00
c8dff8fbc5
it just works
2020-02-04 04:18:44 -05:00
bb3505c184
Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node
...
Comments out meteor defense tech node
2020-02-04 05:26:25 +01:00
33ef9b4619
Update all_nodes.dm
2020-02-04 05:15:52 +01:00
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
a365f3b499
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
2020-02-03 05:16:32 +01:00
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
d314619d0e
Comments out meteor defense tech node
...
asdf
2020-02-01 23:34:33 -05:00
e985d21ea3
fucking combifan
2020-02-01 20:23:01 -06:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
471deba88c
large rcd carts 5head
2020-02-01 13:26:43 -06:00
81cf670729
shit whoops
2020-02-01 13:22:16 -06:00
be525e3f58
good ol twoliner prs
2020-01-31 20:05:27 -06:00
335fd6ffa1
a
2020-01-31 19:32:35 +01:00
7f14fa3c71
not-so-wip now.
2020-01-31 19:20:59 +01:00
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
dca1d8bcd3
Merge pull request #10761 from Putnam3145/fix-forced-gender
...
Makes gender change potion not work on people with pref
2020-01-29 05:31:18 +01:00
611fd7ea89
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-27 23:35:35 -07:00
cfd65d812a
Makes gender change potion not work on people with pref
2020-01-27 19:13:50 -08:00
e50eb495df
pre attack refactor
2020-01-27 16:30:23 -07:00
603ab65ed1
Merge pull request #10151 from Ghommie/Ghommie-cit450
...
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
2020-01-25 19:33:26 -07:00
a5404f6063
Merge pull request #10687 from Ghommie/Ghommie-cit523
...
A few more, ported, runtime fixes.
2020-01-25 05:54:03 -07:00
d5daae98c7
Merge pull request #9905 from Trilbyspaceclone/glassware
...
[Ready] Cargo MK III - Glassware Addtion
2020-01-24 18:46:25 +01:00
831ac91917
Merge pull request #10073 from Ghommie/Ghommie-cit435
...
Ports timestop and sepia extracts improvements/tweaks.
2020-01-24 00:25:53 -07:00
9761d68f4b
more merge conflict fixes
2020-01-24 10:14:31 +08:00
721fd108f9
A few more, ported, runtime fixes.
2020-01-24 03:02:07 +01:00
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
21867f60dd
Merge pull request #10598 from Putnam3145/metabolic-synth-tweak
...
Made metabolic synthesis nanites stop if not fed
2020-01-23 16:38:39 +01:00
3ce27d6c36
Merge pull request #10638 from Hatterhat/patch-3
...
compact defibs have a properly set departmental flag now
2020-01-23 02:51:17 +01:00
8e49c99ca0
Merge pull request #10619 from Seris02/conveyor
...
conveyor updates
2020-01-21 03:37:42 +01:00
fae0d6fe3f
remember when i hoped i didnt forget something
2020-01-20 18:06:07 -06:00
348fa8be86
salt pr @kevinz000
2020-01-20 17:27:51 -06:00
Ghom