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
8ea6618f5d
Revert "ARGH"
...
This reverts commit f0f52ce3f8
2019-11-24 03:01:59 +00:00
Fermi
f0f52ce3f8
ARGH
2019-11-24 02:55:50 +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
kevinz000
75510d8da9
Merge pull request #9749 from Trilbyspaceclone/patch-238
...
What do you mean I cant hold the armory on my back? -BOH nerf
2019-11-23 11:42:37 -07:00
Lin
028fa518e4
Merge pull request #9879 from Ghommie/Ghommie-cit383
...
Unmodularize closets.
2019-11-23 05:39:33 +00:00
Putnam3145
037b278e9e
Merge pull request #9918 from Ghommie/Ghommie-cit384
...
[S] Makes it compile.
2019-11-22 18:14:41 -08:00
Ghommie
77800cf720
Oh yea it's a list
2019-11-23 03:02:29 +01:00
Ghommie
2d1edf661b
Fixes travis.
2019-11-23 02:58:03 +01:00
Putnam3145
ea4fdf727b
Merge pull request #9917 from Ghommie/Ghommie-cit384
...
[S] bikehorn fix 2: sound() doesn't accept double quotes i think, my bad.
2019-11-22 17:06:50 -08:00
Ghommie
82d97ff4a7
This way is better
2019-11-23 01:51:31 +01:00
Ghommie
24c93d9df6
[S] bikehorn fix 2: sound() datum doesn't accept double quotes, my bad.
2019-11-23 01:46:59 +01: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
Lin
1ddb9935ff
Merge pull request #9530 from Ghommie/Ghommie-cit245
...
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Lin
3979079fde
Merge pull request #9518 from Ghommie/Ghommie-cit243
...
Ports "You can now click on objects and mobs below flaps and signs"
2019-11-22 01:36:47 +00:00
Lin
c2d182d50d
Merge pull request #9823 from Seris02/wintergalorefix
...
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
2019-11-22 01:16:35 +00:00
Lin
2412bad483
Merge pull request #9889 from GrayRachnid/fixgoldbox
...
Fixes gold toolbox inhand sprite having the wrong name
2019-11-22 01:14:39 +00:00
kevinz000
1efd3ae395
Merge pull request #9866 from Useroth/tatorstrangeseeds
...
Adds strange seeds as a buyable traitor botanist item.
2019-11-20 22:09:53 -07:00
Seris02
60def2a9fc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix
2019-11-21 13:08:23 +08:00
kevinz000
c503e564db
Merge pull request #9873 from Ghommie/Ghommie-cit378
...
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 21:48:41 -07:00
GrayRachnid
4ae76cf1d9
WHY
...
D
2019-11-20 23:11:46 -05:00
GrayRachnid
48d1bd1160
fixes goldbox
2019-11-20 18:47:35 -05:00
Ghommie
ac44bfcad2
chem dispenser beakers and bikehorn fixes.
2019-11-20 17:55:11 +01:00
Useroth
e2c8efa824
Oopsie. I need to stop committing code without comipiling.
2019-11-20 15:36:55 +01:00
Useroth
2a8152c835
Applied suggestions.
2019-11-20 15:15:10 +01:00
Ghommie
10373c7c96
Unmodularize closets.
2019-11-20 06:41:59 +01:00
kevinz000
7503366524
Merge pull request #9853 from Ghommie/Ghommie-cit370
...
Adds a few extra cardboard cutout variants.
2019-11-19 21:38:32 -07:00
kevinz000
56413c1460
Merge pull request #9846 from KathrinBailey/IKEA-station-13
...
IKEA Station 13: Import TG's Pews
2019-11-19 21:30:56 -07:00
kevinz000
f883f55391
Merge pull request #9818 from GrayRachnid/portssaboteur
...
Ports the Saboteur borg for nukeops and new cyborg tools/weapon icons.
2019-11-19 21:28:25 -07:00
Ghommie
7c0c14e059
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
2019-11-20 03:35:06 +01:00
Useroth
5169205a19
Added a 10pack as well
2019-11-19 19:35:37 +01:00
kevinz000
2494ea4d07
Merge pull request #9824 from YakumoChen/YakumoChen-mariplush
...
Adds Marisa plushie
2019-11-19 01:55:59 -07:00
kevinz000
40a01dedfe
Merge pull request #9806 from BlackMajor/Yote
...
Borg changes. Compresses Service/Janitor/Scrubpuppy borgs together. Removes borgi. Adds vore sleepers to service and engi dogborgs. Demodularizes some dogborg stuff too.
2019-11-19 01:54:47 -07:00
Lin
c188c20f37
Merge pull request #9802 from Ghommie/Ghommie-cit349
...
Unmodularize bikehorns and holy weapons.
2019-11-19 03:24:38 +00:00
Trilbyspaceclone
d90812b0b2
reverts rapier nerfs
2019-11-18 06:26:25 -05:00
Ghommie
86072fe682
"
2019-11-18 04:15:33 +01:00
Ghommie
deadffe96f
missing parenthesis.
2019-11-18 03:26:04 +01:00
Ghommie
1c39a3bc6d
Adds a few extra cardboard cutout variants.
2019-11-18 03:23:24 +01:00
Trilbyspaceclone
c575b3c798
base ball bats, katanan's and chainsaws will still fit
2019-11-17 13:54:18 -05:00
Trilbyspaceclone
7780a14a60
rapier huge
2019-11-17 13:49:32 -05:00
KathrinBailey
05c74c731b
Ports TG pew files
2019-11-17 14:20:44 +00:00
Seris02
b146fd14f3
actually adds the winter coats
2019-11-16 18:25:05 +08:00
