Commit Graph

1466 Commits

Author SHA1 Message Date
Lin
8511c44f0f Merge pull request #10199 from Ghommie/Ghommie-cit467
Fixing and cleaning up the blood bank generator code.
2019-12-19 23:39:17 +00:00
Lin
66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2019-12-19 23:00:52 +00:00
Putnam3145
670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
Ghommie
3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 2019-12-17 03:34:11 +01:00
Lin
237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie
b0e8fb42cd AAAAA 2019-12-16 14:00:14 +01:00
Ghommie
fb6b01a4ae testing, further improvements. Tired. 2019-12-16 02:29:53 +01:00
Ghommie
6a5a098458 Fixing the blood bank generator. 2019-12-16 01:43:21 +01:00
Lin
43646434a0 Merge pull request #10163 from Ghommie/Ghommie-cit455
Allows blood bank generators to be wrenched and unwrenched.
2019-12-14 23:59:58 +00:00
Ghommie
3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00
Ghommie
319d4d51bb Allows blood bank generators to be wrenched and unwrenched. 2019-12-13 04:26:37 +01:00
Ghommie
4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
BlackMajor
8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2019-12-10 11:18:55 +13:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
kevinz000
83ab577a6a Update launchpad_control.dm 2019-12-08 07:30:05 -07:00
Ghommie
7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
kevinz000
2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
kevinz000
29497320c1 Merge pull request #10025 from Linzolle/butchering
refactor butchering component
2019-12-05 21:19:57 -07:00
Ghommie
5669c77d48 Bad 2019-12-02 19:21:01 +01:00
Ghommie
30b67afed9 holodeck machineries and structures have nodeconstruct_1, which means they won't call on_deconstruct anyway. 2019-12-02 19:18:36 +01:00
Ghommie
cd3952cb9e Fixes holodeck sleepers leaving sleeper buffers behind when deleted. 2019-12-02 19:08:21 +01:00
Linzolle
19b004edab update butchering 2019-12-01 14:35:11 -06:00
kevinz000
f0f2063884 Merge pull request #9958 from Ghommie/Ghommie-cit396
Ports a few telecomms updates and fixes.
2019-11-28 23:12:19 -07:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Putnam3145
09897b4ece Merge pull request #9943 from dapnee/Infiltrate-I-barely-know-her
Ports AI console focus loss fix and fixes an error in my trimline code
2019-11-28 05:37:36 -08:00
Ghommie
f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-27 18:48:20 +01:00
Ghommie
4640d8495d ) 2019-11-27 05:14:08 +01:00
Ghommie
1f69679cfb Ports a few telecomms updates and fixes. 2019-11-27 04:58:05 +01:00
kevinz000
ccfdb74508 Merge pull request #9882 from FestiveBall/Fersi
[READY] Allows addition of reagents to sleepers for injection and detection of failed organs (minor GUI tweak.)
2019-11-26 16:02:42 -07:00
Dap
281ddf73ba Ports AI console focus loss fix and fixes an error in my trimline code
Port of https://github.com/tgstation/tgstation/pull/44207 and I copy pasted code and missed renaming one thing.
2019-11-25 14:48:26 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Lin
592dcdb6fd Merge pull request #9896 from Ghommie/Ghommie-cit386
Fixing cyborg camera interaction for real
2019-11-23 05:52:11 +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
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
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
Fermi
cac69eb158 Minor ID oops 2019-11-20 12:28:17 +00:00
Fermi
a0fe4c74ed HECK 2019-11-20 12:15:20 +00:00
Fermi
68a30e9969 Final pass 2019-11-20 12:11:44 +00:00
Fermi
257b60ece6 ID 2019-11-20 11:58:58 +00:00
Fermi
4dd8223634 Undoes circuitboards and converts to sleeper. 2019-11-20 11:58:06 +00:00
Fermi
f055d214f2 ID and emag 2019-11-20 11:47:25 +00:00
Fermi
48e1c64c8d Final 2019-11-20 11:35:40 +00:00
kevinz000
34a8dc5962 Merge pull request #9850 from Ghommie/Ghommie-cit368
fixing a few minor issues with console frames building.
2019-11-19 21:38:58 -07:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00