 kevinz000andGitHub
|
2e01c46fc9
|
Merge pull request #12227 from TheObserver-sys/WhyInEnginesNameDidWeUseACellFromAtmosForElectroplating
Fixes Electroplating for real this time! We promise!
|
2020-05-14 04:46:47 -07:00 |
|
|
kevinz000andGitHub
|
616d104c23
|
Merge pull request #12189 from Ghommie/Ghommie-cit735
Skill modifier datums.
|
2020-05-14 04:46:24 -07:00 |
|
|
ArturlangandGitHub
|
ada31990d0
|
Fixes prosthetic causing bloodsuckers to bug out (#12136)
* Fixes prosthetic causing bloodsuckers to bug out
* Moved it per ghommies suggestions
|
2020-05-14 13:44:48 +02:00 |
|
|
GhomandGitHub
|
fc980b31c2
|
I did a typo.
|
2020-05-14 13:44:06 +02:00 |
|
|
GhomandGitHub
|
ce2bb9ff84
|
Kevinz "the braveless" 000's suggestion.
|
2020-05-14 13:43:36 +02:00 |
|
|
|
fc0ac23eed
|
slight modifications to soda/booze dispenser emag reagents (#12174)
* these
* coom.
* move
* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
* Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-14 04:27:19 +02:00 |
|
|
Ghommie
|
fc5d5fb087
|
Moving buttons away from windows.
|
2020-05-14 00:23:47 +02:00 |
|
|
LinandGitHub
|
0d92783a91
|
oops. (#12242)
|
2020-05-14 00:22:57 +02:00 |
|
|
|
899c5a4575
|
Corrects evey storge with storage (#12220)
* Update medical.dm
* Update autobottler.dm
* Update autobotter_designs.dm
* Update medical_designs.dm
* Update hardsuit.dm
* Update code/modules/cargo/bounties/medical.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-13 21:21:11 +02:00 |
|
|
LinandGitHub
|
2dedf0d6b6
|
Merge pull request #12015 from kevinz000/typing_indicators
Typing Indicators (v2)
|
2020-05-13 18:19:26 +00:00 |
|
|
Detective Google
|
e2ddfcf77b
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-13 00:56:25 -05:00 |
|
|
|
871361936c
|
Replaces mosins in russian crates with 10mm surplus rifles (#12176)
* Update security.dm
* Update armory.dm
* desc
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-13 05:35:01 +02:00 |
|
|
Detective Google
|
4378a34ea7
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-12 21:34:04 -05:00 |
|
|
kevinz000andGitHub
|
4aca1e8f62
|
Update medicine_reagents.dm (#12233)
|
2020-05-13 04:20:05 +02:00 |
|
|
Ghommie
|
62418ced9d
|
floor
|
2020-05-13 03:50:27 +02:00 |
|
|
Ghommie
|
88e499a39a
|
Some quick economy fixes and improvements.
|
2020-05-13 03:31:16 +02:00 |
|
|
LinandGitHub
|
fd30edca9c
|
infinixeno (#12234)
|
2020-05-13 03:18:25 +02:00 |
|
|
Detective Google
|
6e5e1b249f
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-12 18:38:28 -05:00 |
|
|
Detective Google
|
948081fdce
|
outdoor lights, rad protection
|
2020-05-12 17:13:23 -05:00 |
|
|
kevinz000andGitHub
|
ffc7211444
|
Update _wires.dm (#12199)
|
2020-05-12 22:02:40 +02:00 |
|
|
kevinz000andGitHub
|
81424914e6
|
Merge pull request #12215 from Trilbyspaceclone/patch-377
Adds more ballmer lines
|
2020-05-12 12:35:05 -07:00 |
|
|
kevinz000andGitHub
|
5364666d0c
|
Merge pull request #12212 from Trilbyspaceclone/patch-376
Buffs and corrects organ storage box
|
2020-05-12 12:34:45 -07:00 |
|
|
kevinz000andGitHub
|
6ddd0ffa77
|
Merge pull request #12207 from Ghommie/Ghommie-cit743
Fixed several item action buttons not using their own states
|
2020-05-12 12:28:24 -07:00 |
|
|
kevinz000andGitHub
|
ff2158b20b
|
Merge pull request #12206 from Ghommie/Ghommie-cit742
Porting tg's icon for that plant-speak language.
|
2020-05-12 12:28:08 -07:00 |
|
|
kevinz000andGitHub
|
395d434e6e
|
Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
|
2020-05-12 12:28:02 -07:00 |
|
|
kevinz000andGitHub
|
40d2d35ffa
|
Merge pull request #12205 from Ghommie/Ghommie-cit741
A few runtimes, fixed.
|
2020-05-12 12:27:45 -07:00 |
|
|
kevinz000andGitHub
|
afbbde610a
|
Merge pull request #12201 from Ghommie/Ghommie-cit740
Purging unused dogborg items.
|
2020-05-12 12:27:26 -07:00 |
|
|
TrilbyspacecloneandGitHub
|
11f3d19edf
|
brute force
|
2020-05-12 15:02:37 -04:00 |
|
|
Ghommie
|
757706653d
|
Map paths.
|
2020-05-12 21:01:34 +02:00 |
|
|
TrilbyspacecloneandGitHub
|
c5c11a7937
|
i hope we use PENDAS
|
2020-05-12 14:53:06 -04:00 |
|
|
kevinz000
|
1f773cf4fe
|
fixes
|
2020-05-12 11:52:45 -07:00 |
|
|
TrilbyspacecloneandGitHub
|
72fbd8ec87
|
6 rather the 4 miss-keyed
|
2020-05-12 14:27:32 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
88394151d8
|
Update research.dm
|
2020-05-12 14:22:05 -04:00 |
|
|
Ghommie
|
7fb96ab0cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-05-12 20:06:59 +02:00 |
|
|
kevinz000andGitHub
|
90d4f213bf
|
Update preferences.dm (#12230)
|
2020-05-12 17:39:37 +02:00 |
|
|
kevinz000
|
8952eb3e96
|
WOOPS
|
2020-05-12 07:45:00 -07:00 |
|
|
kevinz000
|
ea35e297c2
|
fixes
|
2020-05-12 07:38:52 -07:00 |
|
|
kevinz000andGitHub
|
c473280099
|
Update subsystems.dm
|
2020-05-12 07:04:00 -07:00 |
|
|
kevinz000andGitHub
|
bcf60089b0
|
Update projectiles.dm
|
2020-05-12 07:03:06 -07:00 |
|
|
The0bserver
|
e9a432d438
|
Initial Commit: Hey Drake? Where's the cell for electroplating?
|
2020-05-12 04:07:26 -04:00 |
|
|
MrJWhit
|
bc148ad39f
|
Space diner location
|
2020-05-12 01:52:47 -04:00 |
|
|
Detective Google
|
bfde367c4e
|
Merge remote-tracking branch 'upstream/master' into snaxi2
|
2020-05-11 20:56:42 -05:00 |
|
|
GhomandGitHub
|
bd19763236
|
Update lighting.dm
|
2020-05-12 00:18:27 +02:00 |
|
|
TrilbyspacecloneandGitHub
|
95330e4baf
|
Update life.dm
|
2020-05-11 17:17:04 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
c14197bd1b
|
Update life.dm
|
2020-05-11 17:16:10 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
0df3483d6f
|
Update life.dm
|
2020-05-11 17:15:29 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
8fa1a0ba58
|
Update life.dm
|
2020-05-11 15:48:01 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
720abbf1c5
|
Update life.dm
|
2020-05-11 15:21:49 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
1e5cce73d9
|
Update life.dm
|
2020-05-11 15:19:39 -04:00 |
|
|
Ghommie
|
dfae071015
|
Final adjustments.
|
2020-05-11 19:05:58 +02:00 |
|