Thalpy
a0a52018f3
Apply suggestions from code review
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-21 19:06:34 +00:00
Thalpy
da1da717d2
Update code/game/objects/items/devices/scanners.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-11-21 19:03:48 +00:00
Thalpy
bd07ff4bf7
This should be the one!
2019-11-21 18:55:43 +00:00
Unknown
4974400ccb
Merge branch 'master' into xantholne-berets01
2019-11-21 11:01:42 -07:00
Thalpy
00bffba7ea
Why do surgeries always end up with jank
2019-11-21 15:57:21 +00:00
Useroth
2ced7db508
Ported a bunch of tg hydroponic stuff.
2019-11-21 10:53:57 +01:00
Unknown
71b3b8fdc6
Ports/Adds new Berets
...
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07: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
Fermi
b911fabb37
Okay bedtime
2019-11-21 04:25:25 +00:00
GrayRachnid
4ae76cf1d9
WHY
...
D
2019-11-20 23:11:46 -05:00
Fermi
b90213882e
Again with the rouge
2019-11-21 03:58:16 +00:00
Fermi
01f465dc8c
Scanner formatting
2019-11-21 03:52:00 +00:00
Fermi
18e1246fd0
Classic fixes
2019-11-21 03:16:18 +00:00
Fermi
cc53a0061f
Well it compiles
2019-11-21 02:15:58 +00: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
Fermi
4dd8223634
Undoes circuitboards and converts to sleeper.
2019-11-20 11:58:06 +00:00
Fermi
48e1c64c8d
Final
2019-11-20 11:35:40 +00: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
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
BlackMajor
1b1ed21f42
No adrenals for borgs please
2019-11-19 22:13:22 +13: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
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01: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
YakumoChen
5c89447cf9
Update plushes.dm
2019-11-16 09:56:57 +00:00
GrayRachnid
3edaf75722
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
2019-11-15 16:58:45 -05:00
Ghommie
c20bc123ab
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit336
2019-11-15 01:10:39 +01:00
Ghommie
f401e622c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329
2019-11-15 01:01:08 +01:00
Ghommie
5bb6247a6d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit349
2019-11-15 00:57:38 +01:00
kevinz000
02e8a73265
Merge pull request #9737 from Ghommie/Ghommie-cit326
...
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
kevinz000
d5a245945c
Merge pull request #9742 from Seris02/gpsthing
...
makes gps show location on examine
2019-11-14 16:44:40 -07:00
kevinz000
ca99a8285c
Merge pull request #9803 from Ghommie/Ghommie-cit350
...
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
