Linzolle
cc54e5230f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update
2019-11-25 21:01:25 -06:00
Fermi
79a64d9c63
Makes synthtissue a lil easier.
2019-11-25 03:36:39 +00:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
BlackMajor
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
Fermi
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
Fermi
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
Fermi
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
Fermi
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
Fermi
0eb635b908
pls2
...
ugh
2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 02:49:20 +00:00
Fermi
8c97511871
pls
...
ugh
2019-11-24 02:47:52 +00:00
Fermi
135608551f
Merge remote-tracking branch 'upstream/master'
2019-11-24 02:45:28 +00:00
Fermi
00601a0c87
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3
PLASE
2019-11-24 02:41:21 +00:00
Winter Flare
fb4a47d310
Added more items to vendors.
...
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
2019-11-23 15:58:04 -05:00
Fermi
b404e18b15
Merge branch 'master' into FERMICHEMCurTweaks
2019-11-23 00:10:33 +00:00
GrayRachnid
77913406ed
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 18:50:24 -05:00
Putnam3145
6145cd0d96
Merge pull request #9886 from Ghommie/Ghommie-cit384
...
chem dispenser beakers and bikehorn fixes.
2019-11-22 15:48:28 -08:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Thalpy
9af48caa62
OKAY DONE ARGH
2019-11-21 20:46:00 +00:00
Thalpy
7b17bf2acd
god damn bitflags ARGH
2019-11-21 20:30:49 +00:00
Thalpy
0cce3a01f4
Ghommie's requiem
2019-11-21 19:39:55 +00:00
Thalpy
46076c95c7
Ghommie is a good friend
2019-11-21 14:22:04 +00:00
Useroth
29ae9eb962
Added reagent IDs.
2019-11-21 12:52:49 +01:00
Useroth
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
Fermi
cc53a0061f
Well it compiles
2019-11-21 02:15:58 +00:00
Ghommie
ac44bfcad2
chem dispenser beakers and bikehorn fixes.
2019-11-20 17:55:11 +01:00
Useroth
b91d0e27da
An alternative solution to the problems with blackpowder.
2019-11-20 15:49:04 +01:00
Thalpy
ebe3859cc5
syncs size
2019-11-20 13:28:35 +00:00
TrilbySpaceClone
a3aa70be75
Tweaks, and such
...
Tweaks many cargo packs, and fixes a few issues
Sneak peak into the kilm as well
2019-11-20 06:02:06 -05:00
Ghommie
c21a137a62
Fixes super-lube waterflower.
2019-11-19 22:56:29 +01:00
Ghommie
dd101ef221
Part 2
2019-11-19 18:00:56 +01:00
Thalpy
bf89df7e7b
Fixing things
2019-11-19 16:03:33 +00:00
Thalpy
c0287cf7b5
Reagent sleepers!
2019-11-19 14:50:22 +00:00
Fermi
9fb6c2f3a3
Okay I gotta hop
2019-11-19 12:22:53 +00:00
Lin
6aa6eaafe6
Merge branch 'master' into abductor-update
2019-11-15 23:24:51 +00:00
Ghommie
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
kevinz000
81303b1225
Merge pull request #9786 from Ghommie/Ghommie-cit345
...
Fixing some reagents taste descriptions.
2019-11-14 16:22:54 -07:00
kevinz000
4c89b8c33f
Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII
...
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
2019-11-14 16:00:45 -07:00
kevinz000
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
kevinz000
2f4562a63b
Merge pull request #9656 from Ghommie/Ghommie-cit290
...
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000
487f98bf68
Merge pull request #9775 from Ghommie/Ghommie-cit340
...
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
2019-11-14 01:40:16 -07:00
kevinz000
e70a76085c
Merge pull request #9789 from PersianXerxes/fixReagentDescriptions
...
Corrects the descriptions of meth and ephedrine
2019-11-14 01:38:01 -07:00
TrilbySpaceClone
73661cfe52
more fixing+ chem selling tweaks
2019-11-13 09:39:42 -05:00
TrilbySpaceClone
de1ce4afc8
more crates and explote fixing
2019-11-13 09:15:44 -05:00
TrilbySpaceClone
ec57e28c17
Merge branch 'master' into Cargo_MKII
2019-11-13 08:00:24 -05:00
