 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 |
|
|
Ghommie
|
c5a7c28a1b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
|
2019-11-12 16:04:05 +01:00 |
|
|
Persi
|
c784cab060
|
Corrects the descriptions of meth and ephedrine to reflect that their movespeed buffs were previously removed.
|
2019-11-12 05:37:30 -05:00 |
|
|
Ghommie
|
fd33879b33
|
Fixing some reagent taste descriptions.
|
2019-11-12 06:20:33 +01:00 |
|
|
Ghommie
|
29114de3f1
|
The actual waterflower, am I funny yet?
|
2019-11-12 00:47:36 +01:00 |
|
|
Ghommie
|
19a511929d
|
and "Replaces the slime extract in the clown biodome with a superlube sprayer."
|
2019-11-11 23:39:03 +01:00 |
|
|
TrilbySpaceClone
|
6e328ea1b1
|
art of the deal
|
2019-11-11 07:26:12 -05:00 |
|
|
Lin
|
df051186eb
|
Merge branch 'master' into abductor-update
|
2019-11-11 00:08:59 +00:00 |
|
|
Ghommie
|
09860d463f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-10 23:23:36 +01:00 |
|
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
|
kevinz000
|
c46b425402
|
Merge pull request #9719 from Ghommie/Ghommie-cit318
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
|
2019-11-10 11:26:06 -07:00 |
|
|
Fermi
|
a0539c79e9
|
Fixa da goof
|
2019-11-07 00:03:46 +00:00 |
|