Ghom
5e603c1cce
Merge pull request #11064 from Trilbyspaceclone/more_implants
...
3 new arm tool set implants
2020-03-06 01:25:02 +01:00
Ghom
44a9add328
Merge pull request #11328 from Trilbyspaceclone/Hey-Teens!
...
Removed unused techweb var - Cargo selling of Techwebs nodes
2020-03-06 01:21:09 +01:00
TrilbySpaceClone
7e51cf9ab3
Removed unused techweb var
2020-03-04 16:30:10 -05:00
Seris02
c4e9472b85
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into nomoreailipreading
2020-02-24 17:48:58 +08:00
Seris02
cbdb12e110
yes
2020-02-24 17:47:29 +08:00
TrilbySpaceClone
c638a83e23
Merge branch 'master' into more_implants
2020-02-22 18:34:02 -05:00
Trilbyspaceclone
becdd3c4c1
Merge branch 'master' into more_crates+bags
2020-02-22 18:33:26 -05:00
Seris02
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
Ghom
26bbc64f16
Merge pull request #11136 from Owai-Seek/broomport-2-17-19
...
Ports Broom, Tweak Janitor Vendor
2020-02-20 11:48:06 +01:00
Winter Flare
1a994e7f1e
Ports Broom, Tweak Janitor Vendor
...
Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120
Makes Broom printable.
Reduces Broom sound effect.
Updates Janitor Vendor to have equipment for at least 2 janitors.
2020-02-17 23:36:22 -05:00
necromanceranne
5c2e244ee0
Ports /tg/ pr #44529 , reverts #9092
2020-02-16 22:20:50 +11:00
Trilbyspaceclone
3fde58434f
Merge branch 'master' into more_implants
2020-02-16 01:55:19 -05:00
kevinz000
14fdd90618
Nerfs public autolathes ( #10970 )
2020-02-16 07:37:24 +01:00
Seris02
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
Ghom
33931da018
Merge pull request #11013 from r4d6/pickaxe
...
Add two more pickaxes, Titanium & Plasteel
2020-02-14 19:34:01 +01:00
Trilbyspaceclone
7650f9d45e
shield b gone
2020-02-13 14:20:31 -05:00
Ghom
121b37410a
Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
...
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
Trilbyspaceclone
47709a7ea8
forgot the shield implant
2020-02-13 03:52:41 -05:00
TrilbySpaceClone
75844930b4
new implants!
2020-02-13 03:42:59 -05:00
r4d6
8b68e57de0
Add the pickaxes
2020-02-10 22:02:39 -05:00
Winter Flare
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
TrilbySpaceClone
5dbfc9a514
Yay
2020-02-08 03:25:09 -05:00
Trilbyspaceclone
980d26df76
Cadaver Management
2020-02-06 02:48:30 -05:00
Seris02
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
Hatterhat
385aea3d14
rcd ammo to indeng, typo
2020-02-04 18:50:09 -06:00
Trilbyspaceclone
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
kevinz000
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
TrilbySpaceClone
c8dff8fbc5
it just works
2020-02-04 04:18:44 -05:00
Ghom
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
Ghom
33ef9b4619
Update all_nodes.dm
2020-02-04 05:15:52 +01:00
Ghommie
a365f3b499
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
2020-02-03 05:16:32 +01:00
MrJWhit
d314619d0e
Comments out meteor defense tech node
...
asdf
2020-02-01 23:34:33 -05:00
Hatterhat
e985d21ea3
fucking combifan
2020-02-01 20:23:01 -06:00
Hatterhat
471deba88c
large rcd carts 5head
2020-02-01 13:26:43 -06:00
Seris02
9761d68f4b
more merge conflict fixes
2020-01-24 10:14:31 +08:00
Hatterhat
348fa8be86
salt pr @kevinz000
2020-01-20 17:27:51 -06:00
Hatterhat
28a2cc4a3d
.357 AP printable from illegal ballistics
2020-01-19 23:55:12 -06:00
Seris02
718ff58e0b
fixes + advanced injectors
2020-01-19 15:17:57 +08:00
keronshb
69b5164103
Merge branch 'master' into RemoteMoodResearch
2020-01-16 15:50:11 -05:00
Seris02
a8e4989d74
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-15 12:15:13 +08:00
Seris02
16b5c83a3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-13 12:53:52 +08:00
Hatterhat
83f8e42fb3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046
2020-01-12 12:37:19 -06:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Hatterhat
0773f1b7fa
sweet merciful FUCK what is this merge
2020-01-12 02:53:30 -06:00
kevinz000
60524fb9c7
Merge pull request #10416 from r4d6/RCD-Updates
...
Massive RCD Port & Updates
2020-01-12 00:45:21 -08:00
kevinz000
4b4864740b
Merge pull request #10522 from Hatterhat/syndi-sleeper
...
printable syndicate sleepers - this is blackmajors fault im not gonna lie
2020-01-12 00:40:17 -08:00
Ghom
34502cab1d
Merge pull request #10247 from Seris02/atmosfirelock
...
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
Seris02
ac4489c6a8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-11 13:55:29 +08:00
Hatterhat
b5f8e46941
this is blackmajors fault im not gonna lie
2020-01-10 23:41:30 -06:00
Hatterhat
102e973737
considering these are basic nodes
2020-01-09 18:39:31 -06:00
