 Winter Flare
|
03dae580a9
|
Minor QoL and Wardrobe Updates
|
2019-11-22 14:08:12 -05:00 |
|
|
lolman360
|
216790d442
|
Merge branch 'master' into HeadCorgi
|
2019-11-22 21:54:05 +11: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 |
|
|
Ghommie
|
0ac188bde9
|
Unmodularize gamemodes folder.
|
2019-11-22 05:00:53 +01: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 |
|
|
Putnam
|
72a119da2e
|
Prevents VR mobs from being midround antags.
|
2019-11-21 17:31:22 -08: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 |
|
|
Putnam
|
6062ab0c9b
|
Also make it log ALL threat changes.
|
2019-11-21 16:39:16 -08: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
|
c22ae596fc
|
Merge pull request #9880 from Putnam3145/meteor-random-fix
Makes sure every dynamic-triggered event isn't random on dynamic
|
2019-11-20 22:12:42 -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
|
42de0d5ebe
|
Merge pull request #9831 from Putnam3145/dynamic-nukeops-pop-fix
Makes dynamic nukeops population scaling more like secret
|
2019-11-20 22:01:49 -07:00 |
|
|
kevinz000
|
540a57b518
|
Merge pull request #9828 from Putnam3145/dynamic-meteor-nonrepeat
Makes meteor not repeatable in dynamic.
|
2019-11-20 21:53:05 -07:00 |
|
|
kevinz000
|
8df8acb1b7
|
Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
|
2019-11-20 21:49:58 -07: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 |
|
|
kevinz000
|
4b41a70e13
|
Merge pull request #9875 from Putnam3145/required-candidates-works-now
Makes from-ghosts rulesets cancel if fewer than required candidates
|
2019-11-20 21:47:48 -07:00 |
|
|
kevinz000
|
95951add5c
|
Merge pull request #9870 from Ghommie/Ghommie-cit377
Moves some clockie paper info to the right file.
|
2019-11-20 21:43:35 -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 |
|
|
Ghommie
|
2e55495557
|
ayy
|
2019-11-21 04:48:42 +01:00 |
|
|
Ghommie
|
399a5080da
|
Fixing cyborg camera interaction for real
|
2019-11-21 04:42:49 +01:00 |
|
|
Fermi
|
18e1246fd0
|
Classic fixes
|
2019-11-21 03:16:18 +00:00 |
|
|
Putnam
|
435d2f893e
|
Makes roundend threat log only show actual changes.
|
2019-11-20 18:31:39 -08:00 |
|
|
Fermi
|
cc53a0061f
|
Well it compiles
|
2019-11-21 02:15:58 +00:00 |
|
|
Putnam
|
afc137f0a3
|
Reverted making latejoiners count for roundstart rulesets
|
2019-11-20 17:16:57 -08:00 |
|
|
GrayRachnid
|
48d1bd1160
|
fixes goldbox
|
2019-11-20 18:47:35 -05:00 |
|
|
Fermi
|
a4d61f8571
|
Okay last tweak I'm seriously gonna stop
|
2019-11-20 21:44:02 +00:00 |
|
|
Fermi
|
bfb5f75016
|
Finishing up final UI adjustments
|
2019-11-20 21:23:54 +00:00 |
|
|
Fermi
|
b62892ab1d
|
Allows purge of synthchems.
|
2019-11-20 17:46:06 +00: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 |
|
|
Thalpy
|
3bf10ba575
|
Syncs size 2 revengance
|
2019-11-20 13:56:02 +00:00 |
|
|
Fermi
|
363f0b2df7
|
All good
|
2019-11-20 12:44:33 +00:00 |
|