 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 |
|
|
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 |
|
|
Winter Flare
|
03dae580a9
|
Minor QoL and Wardrobe Updates
|
2019-11-22 14:08:12 -05:00 |
|
|
TrilbySpaceClone
|
b01be3b1ff
|
Merge branch 'master' into crow
|
2019-11-22 05:48:36 -05:00 |
|
|
Winter Flare
|
05b22caaa3
|
Added 12 new crates, fixed issues raised in #9901
Remake of previous PR that I broke due to inexperiance.
Added 12 new crates to cargo.
Re-ordered some some of the crates.
|
2019-11-22 02:37:57 -05:00 |
|
|
TrilbySpaceClone
|
2136968585
|
Ring ring
|
2019-11-21 21:55:17 -05: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 |
|
|
Thalpy
|
7b17bf2acd
|
god damn bitflags ARGH
|
2019-11-21 20:30:49 +00:00 |
|
|
Thalpy
|
7460c28b60
|
Merge branch 'OrganQoL' of https://github.com/Thalpy/Citadel-Station-13 into OrganQoL
|
2019-11-21 19:39:58 +00:00 |
|
|
Thalpy
|
0cce3a01f4
|
Ghommie's requiem
|
2019-11-21 19:39:55 +00:00 |
|
|
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 |
|
|
Ghommie
|
f2aba997c7
|
consistency
|
2019-11-20 06:17:43 +01:00 |
|
|
Ghommie
|
fe171ac40a
|
Unmodularize several machinery and structures.
|
2019-11-20 06:13:57 +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 |
|